diff --git a/SConstruct b/SConstruct
index 4df8e0089d7..ed65f2b89fe 100644
--- a/SConstruct
+++ b/SConstruct
@@ -173,6 +173,17 @@ for p in platform_list:
 	env['CCFLAGS'] = ''
 
 	env.Append(CCFLAGS=string.split(str(CCFLAGS)))
+
+	CFLAGS = env.get('CFLAGS', '')
+	env['CFLAGS'] = ''
+
+	env.Append(CFLAGS=string.split(str(CFLAGS)))
+
+	LINKFLAGS = env.get('LINKFLAGS', '')
+	env['LINKFLAGS'] = ''
+
+	env.Append(LINKFLAGS=string.split(str(LINKFLAGS)))
+
 	detect.configure(env)
 	env['platform'] = p
         if not env.has_key('platform_libsuffix'):
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index a94e43fc854..89c71418ea1 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -129,8 +129,8 @@ def configure(env):
                 else:
                         VC_PATH=""
 
-		env.Append(CCFLAGS=["/I"+VC_PATH+"/Include"])
-		env.Append(LIBPATH=[VC_PATH+"/Lib"])
+		env.Append(CCFLAGS=["/I" + p for p in os.getenv("INCLUDE").split(";")])
+		env.Append(LIBPATH=[p for p in os.getenv("LIB").split(";")])
 		env.Append(CCFLAGS=["/I"+DIRECTX_PATH+"/Include"])
 		env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"])
 		env['ENV'] = os.environ;