github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-26 06:12:49 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fixed help issue (multiplying themes)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12993 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-04-13 11:58:45 +00:00
parent f49276f799
commit 837cd96b7d
5 changed files with 57 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
uppsrc/ide/InstantSetup.cpp
View file

@ -127,16 +127,23 @@ void InstantSetup()
bool dirty = false;
enum { VS_2015, VS_2017, BT_2017 };
enum { VS_2015, VS_2017, BT_2017, VS_2019, BT_2019 };
for(int version = VS_2015; version <= BT_2017; version++)
for(int version = VS_2015; version <= BT_2019; version++)
for(int x64 = 0; x64 < 2; x64++) {
String x86method = decode(version, VS_2015, "MSVS15", VS_2017, "MSVS17", "MSBT17");
String x86method = decode(version, VS_2015, "MSVS15",
VS_2017, "MSVS17", BT_2017, "MSBT17",
VS_2019, "MSVS19", BT_2019, "MSBT19",
"MSBT");
String x64s = x64 ? "x64" : "";
String method = x86method + x64s;
String builder = (version == VS_2015 ? "MSC15" : "MSC17") + ToUpper(x64s);
String builder = decode(version, VS_2015, "MSC15",
VS_2017, "MSC17", BT_2017, "MSC17",
VS_2019, "MSC19", BT_2019, "MSC19",
"MSC19"
) + ToUpper(x64s);
#ifdef _DEBUG0
#ifdef _DEBUG
method << "Test";
#endif
@ -158,8 +165,11 @@ void InstantSetup()
if(version == VS_2015)
vc = df.Get("/microsoft visual studio 14.0/vc", "bin/cl.exe;bin/lib.exe;bin/link.exe;bin/mspdb140.dll");
else
vc = df.Get(version == BT_2017 ? "/microsoft visual studio/2017/buildtools/vc/tools/msvc"
: "/microsoft visual studio/2017/community/vc/tools/msvc",
vc = df.Get(decode(version, BT_2017, "/microsoft visual studio/2017/buildtools/vc/tools/msvc",
VS_2017, "/microsoft visual studio/2017/community/vc/tools/msvc",
BT_2019, "/microsoft visual studio/2019/buildtools/vc/tools/msvc",
VS_2019, "/microsoft visual studio/2019/community/vc/tools/msvc",
""),
x64 ? "bin/hostx64/x64/cl.exe;bin/hostx64/x64/mspdb140.dll"
: "bin/hostx86/x86/cl.exe;bin/hostx86/x86/mspdb140.dll");
@ -272,8 +282,9 @@ void InstantSetup()
bmSet(bm, "RELEASE_FLAGS", "");
bmSet(bm, "RELEASE_LINK", x64 ? "/STACK:20000000" : "/STACK:10000000");
bmSet(bm, "DISABLE_BLITZ", "");
bmSet(bm, "DEBUGGER", version == BT_2017 ? String() : GetFileFolder(vc) + "/Common7/IDE/devenv.exe");
bmSet(bm, "DEBUGGER", findarg(version, BT_2017, BT_2019) >= 0 ? String()
: GetFileFolder(vc) + "/Common7/IDE/devenv.exe");
bm.GetAdd("PATH") = Join(bins, ";");
bm.GetAdd("INCLUDE") = Join(incs, ";");
bm.GetAdd("LIB") = Join(libs, ";");