summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-10-20 13:54:09 (GMT)
committer jacob1 <jfu614@gmail.com>2013-10-20 13:54:09 (GMT)
commitb4761e47ddac23f7a52b714e2e0631dda1708a79 (patch)
treeb624ff2b51651d5acec53f0a0eb2e80071302b5d
parenteea006ad6f63083782a3decda51b6bf80caa47af (diff)
downloadpowder-b4761e47ddac23f7a52b714e2e0631dda1708a79.zip
powder-b4761e47ddac23f7a52b714e2e0631dda1708a79.tar.gz
fix Sconscript
-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"]