Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-19 16:40:26 +02:00
Code Activity

Renamed Windows Application to GUI Application

Browse source
This commit is contained in:
Brian Fiete 2020-03-21 07:10:16 -07:00
parent 8aba7f0d8e
commit 567662b3c3
3 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
IDE/src/BuildContext.bf
View file

@ -282,8 +282,8 @@ namespace IDE
linkLine.Append(" "); linkLine.Append(" ");
}*/ }*/
if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefWindowsApplication) || if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefGUIApplication) ||
(project.mGeneralOptions.mTargetType == Project.TargetType.C_WindowsApplication)) (project.mGeneralOptions.mTargetType == Project.TargetType.C_GUIApplication))
{ {
linkLine.Append("-mwindows "); linkLine.Append("-mwindows ");
} }
@ -591,9 +591,9 @@ namespace IDE
if (testProjectInfo != null) if (testProjectInfo != null)
linkLine.Append("-subsystem:console "); linkLine.Append("-subsystem:console ");
else if (project.mGeneralOptions.mTargetType == .BeefWindowsApplication) else if (project.mGeneralOptions.mTargetType == .BeefGUIApplication)
linkLine.Append("-subsystem:windows "); linkLine.Append("-subsystem:windows ");
else if (project.mGeneralOptions.mTargetType == .C_WindowsApplication) else if (project.mGeneralOptions.mTargetType == .C_GUIApplication)
linkLine.Append("-subsystem:console "); linkLine.Append("-subsystem:console ");
else if (project.mGeneralOptions.mTargetType == .BeefDynLib) else if (project.mGeneralOptions.mTargetType == .BeefDynLib)
{ {
@ -687,8 +687,8 @@ namespace IDE
linkLine.Append("-nodefaultlib "); linkLine.Append("-nodefaultlib ");
String minRTModName = scope String(); String minRTModName = scope String();
if ((project.mGeneralOptions.mTargetType == .BeefWindowsApplication) || if ((project.mGeneralOptions.mTargetType == .BeefGUIApplication) ||
(project.mGeneralOptions.mTargetType == .C_WindowsApplication)) (project.mGeneralOptions.mTargetType == .C_GUIApplication))
minRTModName.Append("g"); minRTModName.Append("g");
if (options.mBuildOptions.mBeefLibType == .DynamicDebug) if (options.mBuildOptions.mBeefLibType == .DynamicDebug)
minRTModName.Append("d"); minRTModName.Append("d");

9
IDE/src/IDEApp.bf
View file

@ -3736,6 +3736,9 @@ namespace IDE
int lineChar; int lineChar;
sourceViewPanel.mEditWidget.Content.GetCursorLineChar(out line, out lineChar); sourceViewPanel.mEditWidget.Content.GetCursorLineChar(out line, out lineChar);
if (!sourceViewPanel.HasTextAtCursor())
return;
#if IDE_C_SUPPORT #if IDE_C_SUPPORT
if (sourceViewPanel.mIsClang) if (sourceViewPanel.mIsClang)
{ {
@ -8647,7 +8650,7 @@ namespace IDE
newString = scope:ReplaceBlock String(); newString = scope:ReplaceBlock String();
if ((project.mGeneralOptions.mTargetType == .BeefConsoleApplication) || if ((project.mGeneralOptions.mTargetType == .BeefConsoleApplication) ||
(project.mGeneralOptions.mTargetType == .BeefWindowsApplication) || (project.mGeneralOptions.mTargetType == .BeefGUIApplication) ||
(project.mGeneralOptions.mTargetType == .BeefDynLib) || (project.mGeneralOptions.mTargetType == .BeefDynLib) ||
((options.mBuildOptions.mBuildKind == .Test) && (project == mWorkspace.mStartupProject))) ((options.mBuildOptions.mBuildKind == .Test) && (project == mWorkspace.mStartupProject)))
{ {
@ -9005,7 +9008,7 @@ namespace IDE
#if BF_PLATFORM_WINDOWS #if BF_PLATFORM_WINDOWS
if ((project.mGeneralOptions.mTargetType == .BeefConsoleApplication) || if ((project.mGeneralOptions.mTargetType == .BeefConsoleApplication) ||
(project.mGeneralOptions.mTargetType == .BeefWindowsApplication)) (project.mGeneralOptions.mTargetType == .BeefGUIApplication))
{ {
if (workspaceOptions.mToolsetType != .GNU) if (workspaceOptions.mToolsetType != .GNU)
{ {
@ -9990,7 +9993,7 @@ namespace IDE
// temporarily break on _main and then we single step // temporarily break on _main and then we single step
//mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("_ZN3Hey4Dude3Bro9TestClass4MainEv"); //mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("_ZN3Hey4Dude3Bro9TestClass4MainEv");
if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefConsoleApplication) || if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefConsoleApplication) ||
(project.mGeneralOptions.mTargetType == Project.TargetType.BeefWindowsApplication)) (project.mGeneralOptions.mTargetType == Project.TargetType.BeefGUIApplication))
mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-BeefStartProgram"); mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-BeefStartProgram");
else else
{ {

21
IDE/src/Project.bf
View file

@ -864,12 +864,12 @@ namespace IDE
public enum TargetType public enum TargetType
{ {
case BeefConsoleApplication, case BeefConsoleApplication,
BeefWindowsApplication, BeefGUIApplication,
BeefLib, BeefLib,
BeefDynLib, BeefDynLib,
CustomBuild, CustomBuild,
C_ConsoleApplication, C_ConsoleApplication,
C_WindowsApplication, C_GUIApplication,
BeefTest, BeefTest,
BeefApplication_StaticLib, BeefApplication_StaticLib,
BeefApplication_DynamicLib; BeefApplication_DynamicLib;
@ -881,7 +881,7 @@ namespace IDE
switch (this) switch (this)
{ {
case BeefConsoleApplication, case BeefConsoleApplication,
BeefWindowsApplication, BeefGUIApplication,
BeefLib, BeefLib,
BeefDynLib, BeefDynLib,
BeefTest: BeefTest:
@ -899,7 +899,7 @@ namespace IDE
switch (this) switch (this)
{ {
case BeefConsoleApplication, case BeefConsoleApplication,
BeefWindowsApplication: BeefGUIApplication:
return true; return true;
default: default:
return false; return false;
@ -1783,7 +1783,18 @@ namespace IDE
typeOptions.Deserialize(data); typeOptions.Deserialize(data);
mBeefGlobalOptions.mDistinctBuildOptions.Add(typeOptions); mBeefGlobalOptions.mDistinctBuildOptions.Add(typeOptions);
} }
mGeneralOptions.mTargetType = data.GetEnum<TargetType>("TargetType", GetDefaultTargetType());
var targetTypeName = scope String();
data.GetString("TargetType", targetTypeName);
switch (targetTypeName)
{ // Handle Legacy names first
case "BeefWindowsApplication":
mGeneralOptions.mTargetType = .BeefGUIApplication;
case "C_WindowsApplication":
mGeneralOptions.mTargetType = .C_GUIApplication;
default:
mGeneralOptions.mTargetType = data.GetEnum<TargetType>("TargetType", GetDefaultTargetType());
}
} }
using (data.Open("Platform")) using (data.Open("Platform"))