github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Disable BLITZ option in build methods

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9645 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-03-28 07:53:05 +00:00
parent 6daec37a96
commit 6bcc6ca025
5 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/ide/About.cpp
View file

@ -33,6 +33,15 @@ Size MakeLogo(Ctrl& parent, Array<Ctrl>& ctrl)
h << " (64 bit)";
else
h << " (32 bit)";
#ifdef _MSC_VER
h << " (MSC)";
#endif
#if __GNUC__
h << " (GCC)";
#endif
#if __cplusplus >= 201100
h << " (C++11)";
#endif
#ifdef GUI_GTK
h << " (Gtk)";
#endif

4
uppsrc/ide/Builders/Build.cpp
View file

@ -46,7 +46,7 @@ Index<String> MakeBuild::PackageConfig(const Workspace& wspc, int package,
case 1: cfg.FindAdd("DEBUG_MINIMAL"); break;
case 2: cfg.FindAdd("DEBUG_FULL"); break;
}
if(!pkg.noblitz && (p.blitz >= 0 ? p.blitz : m.def.blitz))
if(!pkg.noblitz && (p.blitz >= 0 ? p.blitz : m.def.blitz) && bm.Get("DISABLE_BLITZ", "") != "1")
cfg.FindAdd("BLITZ");
}
else {
@ -54,7 +54,7 @@ Index<String> MakeBuild::PackageConfig(const Workspace& wspc, int package,
case 1: cfg.FindAdd("DEBUG_MINIMAL"); break;
case 2: cfg.FindAdd("DEBUG_FULL"); break;
}
if(!pkg.noblitz && m.def.blitz)
if(!pkg.noblitz && m.def.blitz && bm.Get("DISABLE_BLITZ", "") != "1")
cfg.FindAdd("BLITZ");
}
host.AddFlags(cfg);

2
uppsrc/ide/InstantSetup.cpp
View file

@ -207,6 +207,7 @@ void InstantSetup()
bmSet(bm, "RELEASE_FLAGS", "");
bmSet(bm, "RELEASE_LINK", "/STACK:20000000");
bmSet(bm, "DEBUGGER", "msdev");
bmSet(bm, "DISABLE_BLITZ", "");
bm.GetAdd("PATH") = Join(bins, ";");
bm.GetAdd("INCLUDE") = Join(incs, ";");
@ -262,6 +263,7 @@ void InstantSetup()
bmSet(bm, "RELEASE_LINK", "");
bmSet(bm, "DEBUGGER", "gdb");
bmSet(bm, "ALLOW_PRECOMPILED_HEADERS", "1");
bmSet(bm, "DISABLE_BLITZ", "1");
// bmSet(bm, "LINKMODE_LOCK", "0");
String m = x64 ? "64" : "32";

1
uppsrc/ide/Methods.cpp
View file

@ -407,6 +407,7 @@ void DefaultBuilderSetup::InitSetupCtrlsMap(VectorMap<Id, Ctrl*>& map)
map.Add("RELEASE_LINK", &release_link);
map.Add("DEBUGGER", &debugger);
map.Add("ALLOW_PRECOMPILED_HEADERS", &allow_pch);
map.Add("DISABLE_BLITZ", &disable_blitz);
map.Add("PATH", &path);
map.Add("INCLUDE", &include);
map.Add("LIB", &lib);

3
uppsrc/ide/ide.lay
View file

@ -266,7 +266,8 @@ LAYOUT(BuildMethodsDefaultBuilderSetupLayout, 648, 500)
ITEM(EditString, release_link, HSizePosZ(132, 0).TopPosZ(348, 19))
ITEM(TabCtrl, paths, HSizePosZ(0, 0).VSizePosZ(392, 0))
ITEM(TextOption, allow_pch, SetLabel(t_("Allow precompiled headers")).LeftPosZ(0, 212).TopPosZ(372, 16))
ITEM(LabelBox, dv___38, SetLabel(t_("Debug mode defaults")).HSizePosZ(0, 0).TopPosZ(144, 36))
ITEM(TextOption, disable_blitz, SetLabel(t_("Disable BLITZ")).LeftPosZ(164, 212).TopPosZ(372, 16))
ITEM(LabelBox, dv___39, SetLabel(t_("Debug mode defaults")).HSizePosZ(0, 0).TopPosZ(144, 36))
END_LAYOUT
LAYOUT(ModePaneLayout, 320, 460)