From 9b0db96291f9d615997d4ecd80affbf16d11f4f3 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 29 Oct 2015 19:17:29 +0000 Subject: [PATCH] ide: Instant setup reverted git-svn-id: svn://ultimatepp.org/upp/trunk@9114 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/InstantSetup.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp index eee90ff52..e2c722144 100644 --- a/uppsrc/ide/InstantSetup.cpp +++ b/uppsrc/ide/InstantSetup.cpp @@ -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");