github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-16 06:05:58 -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

8
uppsrc/Core/SSL/SSL.upp
View file

@ -2,13 +2,9 @@ description "OpenSSL based SSL support for Core\3770,128,128";
library(POSIX) "crypto ssl";
library(WIN32 MSC !SHARED !DEBUG) "libeay32MT ssleay32MT";
library(WIN32 MSC !SHARED) "libeay32MT ssleay32MT";
library(WIN32 MSC !SHARED DEBUG) "libeay32MTd ssleay32MTd";
library(WIN32 MSC SHARED !DEBUG) "libeay32MD ssleay32MD";
library(WIN32 MSC SHARED DEBUG) "libeay32MDd ssleay32MDd";
library(WIN32 MSC SHARED) "libeay32MD ssleay32MD";
library(WIN32 GCC) "ssl crypto";

2
uppsrc/ide/AutoSetup.cpp
View file

@ -149,7 +149,7 @@ void AutoSetup()
msc8.method64 <<= "MSC8x64";
String sdk9 = NormalizePathNN(GetWinRegString("InstallationFolder",
"SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v7.0",
HKEY_LOCAL_MACHINE));
HKEY_LOCAL_MACHINE));
if(IsNull(sdk9))
sdk9 = NormalizePathNN(GetWinRegString("InstallationFolder",
"Software\\Microsoft\\Microsoft SDKs\\Windows\\v6.1",

3
uppsrc/ide/Builders/Build.cpp
View file

@ -24,7 +24,8 @@ Index<String> MakeBuild::PackageConfig(const Workspace& wspc, int package,
String packagepath = PackagePath(wspc[package]);
const Package& pkg = wspc.package[package];
cfg.Clear();
mainparam << ' ' << bm.Get(targetmode ? "RELEASE_FLAGS" : "DEBUG_FLAGS", NULL);
MergeWith(mainparam, " ", bm.Get(targetmode ? "RELEASE_FLAGS" : "DEBUG_FLAGS", String()),
bm.Get("COMMON_FLAGS", String()));
cfg = SplitFlags(mainparam, package == 0, wspc.GetAllAccepts(package));
cfg.FindAdd(bm.Get("BUILDER", "GCC"));
const TargetMode& m = GetTargetMode();

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", "");