|
@@ -284,8 +284,13 @@ elif env['platform'] == 'windows':
|
|
env['AR'] = "i686-w64-mingw32-ar"
|
|
env['AR'] = "i686-w64-mingw32-ar"
|
|
env['RANLIB'] = "i686-w64-mingw32-ranlib"
|
|
env['RANLIB'] = "i686-w64-mingw32-ranlib"
|
|
env['LINK'] = "i686-w64-mingw32-g++"
|
|
env['LINK'] = "i686-w64-mingw32-g++"
|
|
|
|
+
|
|
elif host_platform == 'windows' and env['use_mingw']:
|
|
elif host_platform == 'windows' and env['use_mingw']:
|
|
- env = env.Clone(tools=['mingw'])
|
|
|
|
|
|
+ # Don't Clone the environment. Because otherwise, SCons will pick up msvc stuff.
|
|
|
|
+ env = Environment(ENV = os.environ, tools=["mingw"])
|
|
|
|
+ opts.Update(env)
|
|
|
|
+ #env = env.Clone(tools=['mingw'])
|
|
|
|
+
|
|
env["SPAWN"] = mySpawn
|
|
env["SPAWN"] = mySpawn
|
|
|
|
|
|
# Native or cross-compilation using MinGW
|
|
# Native or cross-compilation using MinGW
|
|
@@ -301,7 +306,11 @@ elif env['platform'] == 'windows':
|
|
|
|
|
|
elif env['platform'] == 'android':
|
|
elif env['platform'] == 'android':
|
|
if host_platform == 'windows':
|
|
if host_platform == 'windows':
|
|
- env = env.Clone(tools=['mingw'])
|
|
|
|
|
|
+ # Don't Clone the environment. Because otherwise, SCons will pick up msvc stuff.
|
|
|
|
+ env = Environment(ENV = os.environ, tools=["mingw"])
|
|
|
|
+ opts.Update(env)
|
|
|
|
+ #env = env.Clone(tools=['mingw'])
|
|
|
|
+
|
|
env["SPAWN"] = mySpawn
|
|
env["SPAWN"] = mySpawn
|
|
|
|
|
|
# Verify NDK root
|
|
# Verify NDK root
|