Merge pull request #6501 from SuperUserNameMan/windows_compile_with_standalone_msvc

scons detects standalone MSVC on Windows
This commit is contained in:
Rémi Verschelde
2016-10-03 11:36:44 +02:00
committed by GitHub
4 changed files with 25 additions and 12 deletions

View File

@@ -16,7 +16,6 @@ platform_list = [] # list of platforms
platform_opts = {} # options for each platform
platform_flags = {} # flags for each platform
active_platforms=[]
active_platform_ids=[]
platform_exporters=[]
@@ -60,7 +59,7 @@ platform_arg = ARGUMENTS.get("platform", False)
if (os.name=="posix"):
pass
elif (os.name=="nt"):
if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
if (not methods.msvc_is_detected() or platform_arg=="android"):
custom_tools=['mingw']
env_base=Environment(tools=custom_tools);