Changeset 3353

Timestamp:

Jul 18, 2006, 3:27:18 PM (19 years ago)

Author:

jack

Message:

Fixed building under win32 with scons to default to gcc.

File:

• SConstruct (modified) (3 diffs)

SConstruct

@@ -9 +9 @@
 env = Environment(options = opts)
 
-if env['CC'] == 'gcc':
-    env.Append(CCFLAGS=['${GCCFLAGS}'])
-elif env['CC'] == 'cl':
-    env.Append(CCFLAGS=['${MSVCFLAGS}'])
-
 Help(opts.GenerateHelpText(env))
 
@@ -20 +15 @@
 if sys.platform == 'win32':
     # Prefer MinGW over MSVC
-    env.Prepend(TOOLS=['mingw'])
+    Tool('mingw')(env)
 
     python_include = os.path.join(sys.exec_prefix, 'include')
@@ -45 +40 @@
 env.Append(CPPPATH=[python_include])
 
+# Set appropriate CCFLAGS for the compiler.
+if env['CC'] == 'gcc':
+    env.Append(CCFLAGS=['${GCCFLAGS}'])
+elif env['CC'] == 'cl':
+    env.Append(CCFLAGS=['${MSVCFLAGS}'])
+
 Export('env')