From d197c2d303cd3aec54047cb272f553fd657ea00b Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 21 Oct 2015 18:29:15 +0000
Subject: [PATCH] ide: InstantSetup mingw/openssl support

git-svn-id: svn://ultimatepp.org/upp/trunk@9064 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/InstantSetup.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp
index 14201a842..7dd8c4d14 100644
--- a/uppsrc/ide/InstantSetup.cpp
+++ b/uppsrc/ide/InstantSetup.cpp
@@ -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, ";");