|
@@ -1,10 +1,11 @@
|
|
#
|
|
#
|
|
-# tested on | Windows native | Linux cross-compilation
|
|
|
|
-# ------------------------+-------------------+---------------------------
|
|
|
|
-# MSVS C++ 2010 Express | WORKS | n/a
|
|
|
|
-# Mingw-w64 | WORKS | WORKS
|
|
|
|
-# Mingw-w32 | WORKS | WORKS
|
|
|
|
-# MinGW | WORKS | untested
|
|
|
|
|
|
+# tested on | Windows native | Linux cross-compilation
|
|
|
|
+# ----------------------------+-------------------+---------------------------
|
|
|
|
+# MSVS C++ 2010 Express | WORKS | n/a
|
|
|
|
+# Visual C++ Build Tools 2015 | WORKS | n/a
|
|
|
|
+# Mingw-w64 | WORKS | WORKS
|
|
|
|
+# Mingw-w32 | WORKS | WORKS
|
|
|
|
+# MinGW | WORKS | untested
|
|
#
|
|
#
|
|
#####
|
|
#####
|
|
# Notes about MSVS C++ :
|
|
# Notes about MSVS C++ :
|
|
@@ -12,6 +13,12 @@
|
|
# - MSVC2010-Express compiles to 32bits only.
|
|
# - MSVC2010-Express compiles to 32bits only.
|
|
#
|
|
#
|
|
#####
|
|
#####
|
|
|
|
+# Note about Visual C++ Build Tools :
|
|
|
|
+#
|
|
|
|
+# - Visual C++ Build Tools is the standalone MSVC compiler :
|
|
|
|
+# http://landinghub.visualstudio.com/visual-cpp-build-tools
|
|
|
|
+#
|
|
|
|
+#####
|
|
# Notes about Mingw-w64 and Mingw-w32 under Windows :
|
|
# Notes about Mingw-w64 and Mingw-w32 under Windows :
|
|
#
|
|
#
|
|
# - both can be installed using the official installer :
|
|
# - both can be installed using the official installer :
|
|
@@ -78,7 +85,7 @@
|
|
|
|
|
|
#####
|
|
#####
|
|
# TODO :
|
|
# TODO :
|
|
-#
|
|
|
|
|
|
+#
|
|
# - finish to cleanup this script to remove all the remains of previous hacks and workarounds
|
|
# - finish to cleanup this script to remove all the remains of previous hacks and workarounds
|
|
# - make it work with the Windows7 SDK that is supposed to enable 64bits compilation for MSVC2010-Express
|
|
# - make it work with the Windows7 SDK that is supposed to enable 64bits compilation for MSVC2010-Express
|
|
# - confirm it works well with other Visual Studio versions.
|
|
# - confirm it works well with other Visual Studio versions.
|
|
@@ -102,7 +109,7 @@ def can_build():
|
|
|
|
|
|
if (os.name=="nt"):
|
|
if (os.name=="nt"):
|
|
#building natively on windows!
|
|
#building natively on windows!
|
|
- if (os.getenv("VSINSTALLDIR")):
|
|
|
|
|
|
+ if ( methods.msvc_is_detected() ):
|
|
return True
|
|
return True
|
|
else:
|
|
else:
|
|
print("\nMSVC not detected, attempting Mingw.")
|
|
print("\nMSVC not detected, attempting Mingw.")
|
|
@@ -197,7 +204,7 @@ def configure(env):
|
|
|
|
|
|
env.Append(CPPPATH=['#platform/windows'])
|
|
env.Append(CPPPATH=['#platform/windows'])
|
|
env['is_mingw']=False
|
|
env['is_mingw']=False
|
|
- if (os.name=="nt" and os.getenv("VSINSTALLDIR")!=None):
|
|
|
|
|
|
+ if (os.name=="nt" and methods.msvc_is_detected() ):
|
|
#build using visual studio
|
|
#build using visual studio
|
|
env['ENV']['TMP'] = os.environ['TMP']
|
|
env['ENV']['TMP'] = os.environ['TMP']
|
|
env.Append(CPPPATH=['#platform/windows/include'])
|
|
env.Append(CPPPATH=['#platform/windows/include'])
|