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

ide: instant setup for refactored ssl bin

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9102 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-10-28 13:32:25 +00:00
parent 2c475cde73
commit 7cc7724c46
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/ide/InstantSetup.cpp
View file

@ -183,7 +183,7 @@ void InstantSetup()
bins.At(1) = bin;
String& sslbin = bins.At(2);
if(IsNull(sslbin) || ToLower(sslbin).Find("openssl") >= 0)
sslbin = GetExeDirFile(x64 ? "bin/OpenSSL-Win64" : "bin/OpenSSL-Win32");
sslbin = GetExeDirFile(x64 ? "bin/OpenSSL-Win/bin" : "bin/OpenSSL-Win/bin32");
incs.At(0) = vc + "/include";
incs.At(1) = inc + "/um";
@ -191,14 +191,14 @@ void InstantSetup()
incs.At(3) = inc + "/shared";
String& sslinc = incs.At(4);
if(IsNull(sslinc) || ToLower(sslinc).Find("openssl") >= 0)
sslinc = GetExeDirFile(x64 ? "bin/OpenSSL-Win64/include" : "bin/OpenSSL-Win32/include");
sslinc = GetExeDirFile("bin/OpenSSL-Win/include");
libs.At(0) = vc + (x64 ? "/lib/amd64" : "/lib");
libs.At(1) = lib + (x64 ? "/ucrt/x64" : "/ucrt/x86");
libs.At(2) = lib + (x64 ? "/um/x64" : "/um/x86");
String& ssllib = libs.At(3);
if(IsNull(ssllib) || ToLower(ssllib).Find("openssl") >= 0)
ssllib = GetExeDirFile(x64 ? "bin/OpenSSL-Win64/lib/VC" : "bin/OpenSSL-Win32/lib/VC");
ssllib = GetExeDirFile(x64 ? "bin/OpenSSL-Win/lib/VC" : "bin/OpenSSL-Win/lib32/VC");
bmSet(bm, "BUILDER", x64 ? "MSC15X64" : "MSC15");
bmSet(bm, "COMPILER", "");