From 5afe9dfbdab4331eeafdd022b64a19080bbcd2f3 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 9 Jul 2018 16:39:15 +0000
Subject: [PATCH] ide: Fixed common flags issue, instant setup adjsuted for new
 SSL libraries

git-svn-id: svn://ultimatepp.org/upp/trunk@12062 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/SSL/SSL.upp       | 8 ++------
 uppsrc/ide/AutoSetup.cpp      | 2 +-
 uppsrc/ide/Builders/Build.cpp | 3 ++-
 uppsrc/ide/InstantSetup.cpp   | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/uppsrc/Core/SSL/SSL.upp b/uppsrc/Core/SSL/SSL.upp
index e840fbdd9..d38bc8e44 100644
--- a/uppsrc/Core/SSL/SSL.upp
+++ b/uppsrc/Core/SSL/SSL.upp
@@ -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";
 
diff --git a/uppsrc/ide/AutoSetup.cpp b/uppsrc/ide/AutoSetup.cpp
index 034515df3..69b5a86ad 100644
--- a/uppsrc/ide/AutoSetup.cpp
+++ b/uppsrc/ide/AutoSetup.cpp
@@ -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",
diff --git a/uppsrc/ide/Builders/Build.cpp b/uppsrc/ide/Builders/Build.cpp
index 943ba7e41..9e63bd1b9 100644
--- a/uppsrc/ide/Builders/Build.cpp
+++ b/uppsrc/ide/Builders/Build.cpp
@@ -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();
diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp
index 933924b4c..34f771a10 100644
--- a/uppsrc/ide/InstantSetup.cpp
+++ b/uppsrc/ide/InstantSetup.cpp
@@ -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", "");