summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rwxr-xr-xSConscript4
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 5520484..41cd578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ Makefile.me
*.tlog
*.lib
*.ipch
+*.ilk
*.log
*.lastbuildstate
*.unsuccessfulbuild
diff --git a/SConscript b/SConscript
index 38a6b25..e7833cc 100755
--- a/SConscript
+++ b/SConscript
@@ -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"]