github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-05 17:44:55 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Instant setup reverted

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9114 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-10-29 19:17:29 +00:00
parent 102e686e98
commit 9b0db96291
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/ide/InstantSetup.cpp
View file

@ -169,15 +169,14 @@ void InstantSetup()
if(CheckDirs(bins, 2) && CheckDirs(incs, 4) && CheckDirs(libs, 3)) {
if(!x64)
default_method = "MSC15";
#ifndef _DEBUG
continue;
#endif
}
vc = df.ScanForDir("/vc", "", "bin/link.exe;bin/cl.exe;bin/mspdb140.dll", "bin/1033");
bin = df.ScanForDir(x64 ? "bin/x64" : "bin/x86", "/windows kits/", "ucrt/ucrtbased.dll", "");
inc = df.ScanForDir("", "/windows kits/", "ucrt/assert.h", "");
lib = df.ScanForDir("", "/windows kits/", "ucrt/x86/libucrt.lib", "");
bin = df.ScanForDir(x64 ? "bin/x64" : "bin/x86", "/windows kits/", "makecat.exe;accevent.exe", "");
inc = df.ScanForDir("", "/windows kits/", "um/adhoc.h", "um;ucrt;shared");
lib = df.ScanForDir("", "/windows kits/", "um/x86/kernel32.lib", "um;ucrt");
if(vc.GetCount() * bin.GetCount() * inc.GetCount() * lib.GetCount()) {
bins.At(0) = vc + (x64 ? "/bin/amd64" : "/bin");