diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-10-20 14:38:40 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-10-20 14:38:40 (GMT) |
| commit | d9f1762da0b2c549cef48bb2d7b078a89c9ee959 (patch) | |
| tree | 9f8bcf0e4cfde472447d1ced5a9a5312fc71504a /SConscript | |
| parent | e8c53dc3e8d293ef750f3780b999783ae3537ba9 (diff) | |
| parent | dd73a7244f49de54ccd35a7cf1fdafd1a557e505 (diff) | |
| download | powder-d9f1762da0b2c549cef48bb2d7b078a89c9ee959.zip powder-d9f1762da0b2c549cef48bb2d7b078a89c9ee959.tar.gz | |
Merge branch 'develop' of https://github.com/simtr/The-Powder-Toy into develop
Diffstat (limited to 'SConscript')
| -rwxr-xr-x | SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -135,9 +135,9 @@ if((not GetOption('lin')) and (not GetOption('win')) and (not GetOption('rpi')) # if the platform is windows switch to a mingw toolset, use the default otherwise if(GetOption('win')): - env = Environment(tools = ['mingw']) + env = Environment(tools = ['mingw'], ENV = os.environ) else: - env = Environment(tools = ['default']) + env = Environment(tools = ['default'], ENV = os.environ) if(GetOption("copy_env")): lstvar=["CC","CXX","LD","CFLAGS"] |