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

ide: InstantSetup mingw/openssl support

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9064 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-10-21 18:29:15 +00:00
parent 171d276ec3
commit d197c2d303
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/ide/InstantSetup.cpp
View file

@ -238,7 +238,7 @@ void InstantSetup()
Vector<String> bins = Split(bm.Get("PATH", ""), ';');
Vector<String> incs = Split(bm.Get("INCLUDE", ""), ';');
Vector<String> libs = Split(bm.Get("LIB", ""), ';');
if(CheckDirs(bins, 1) && CheckDirs(incs, 1) && CheckDirs(libs, 1)) {
if(CheckDirs(bins, 2) && CheckDirs(incs, 2) && CheckDirs(libs, 2)) {
default_method = Nvl(default_method, method);
break;
}
@ -267,9 +267,12 @@ void InstantSetup()
bmSet(bm, "ALLOW_PRECOMPILED_HEADERS", "1");
// bmSet(bm, "LINKMODE_LOCK", "0");
bins.At(0) = bin + "/mingw32\\bin";
bins.At(0) = bin + "/mingw32/bin";
bins.At(1) = bin + "/OpenSSL-Win32";
incs.At(0) = bin + "/mingw32/i686-w64-mingw32/include";
incs.At(1) = bin + "/OpenSSL-Win32/include";
libs.At(0) = bin + "/mingw32/i686-w64-mingw32/lib";
libs.At(1) = bin + "/OpenSSL-Win32/lib/MinGW";
bm.GetAdd("PATH") = Join(bins, ";");
bm.GetAdd("INCLUDE") = Join(incs, ";");