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

ide: Fixed common flags issue, instant setup adjsuted for new SSL libraries

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12062 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-07-09 16:39:15 +00:00
parent a6b0226fe3
commit 5afe9dfbda
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/ide/InstantSetup.cpp
View file

@ -186,7 +186,7 @@ void InstantSetup()
String& sslbin = bins.At(2);
if(IsNull(sslbin) || ToLower(sslbin).Find("openssl") >= 0)
sslbin = GetExeDirFile(x64 ? "bin/OpenSSL-Win/bin" : "bin/OpenSSL-Win/bin32");
sslbin = GetExeDirFile(x64 ? "bin/OpenSSL-Win/bin64" : "bin/OpenSSL-Win/bin");
incs.At(0) = vc + "/include";
int ii = 1;
@ -216,7 +216,7 @@ void InstantSetup()
}
String& ssllib = libs.At(3);
if(IsNull(ssllib) || ToLower(ssllib).Find("openssl") >= 0)
ssllib = GetExeDirFile(x64 ? "bin/OpenSSL-Win/lib/VC" : "bin/OpenSSL-Win/lib32/VC");
ssllib = GetExeDirFile(x64 ? "bin/OpenSSL-Win/lib64" : "bin/OpenSSL-Win/lib");
bm.GetAdd("BUILDER") = builder;
bmSet(bm, "COMPILER", "");