summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-27 17:28:32 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-27 17:28:32 (GMT)
commita7da393cfc807048d320ddba8a1c7d24ef23a46e (patch)
tree78bc84f170b1ea43988978e4d37cafc2af5ce680 /BuildTools/SCons
parent48d520ac077dcecd2dfd10dbb4cd689afd28076a (diff)
downloadswift-a7da393cfc807048d320ddba8a1c7d24ef23a46e.zip
swift-a7da393cfc807048d320ddba8a1c7d24ef23a46e.tar.bz2
Fixed windows compilation issues.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConstruct4
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 34884e7..5d2f383 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -62,7 +62,7 @@ if env["PLATFORM"] == "darwin" :
if env["PLATFORM"] == "win32" :
env.Tool("WindowsBundle", toolpath = ["#/BuildTools/SCons/Tools"])
#So we don't need to escalate with UAC
- if "TMP" is os.environ.keys() :
+ if "TMP" in os.environ.keys() :
env['ENV']['TMP'] = os.environ['TMP']
env.Tool("SLOCCount", toolpath = ["#/BuildTools/SCons/Tools"])
@@ -453,7 +453,7 @@ if use_openssl and openssl_conf.CheckCHeader("openssl/ssl.h") :
env["HAVE_OPENSSL"] = 1
env["OPENSSL_FLAGS"] = openssl_flags
if env["PLATFORM"] == "win32" :
- env["OPENSSL_FLAGS"]["LIBS"] = ["libeay32MT", "ssleay32MT"]
+ env["OPENSSL_FLAGS"]["LIBS"] = ["libeay32MD", "ssleay32MD"]
else:
env["OPENSSL_FLAGS"]["LIBS"] = ["ssl", "crypto"]
elif target in ("iphone-device", "iphone-simulator", "xcode") :