Changeset 3327

Timestamp:

Jul 13, 2006, 1:51:34 PM (19 years ago)

Author:

jack

Message:

Improved Build Process under Windows:

MinGW tools should be favoured over MSVC tools.
CFLAGS variable in build_options.py split into MSVCFLAGS and GCCFLAGS

Files:

• SConstruct (modified) (4 diffs)
• build_options.py (modified) (1 diff)
• inundation/mesh_engine/SConscript (modified) (1 diff)
• inundation/pyvolution/SConscript (modified) (1 diff)

SConstruct

@@ -4 +4 @@
 # Read in build options
 opts = Options('build_options.py')
-opts.Add('CFLAGS', 'Flags passed to the C Compiler')
+opts.Add('GCCFLAGS', 'Flags passed to GCC')
+opts.Add('MSVCFLAGS', 'Flags passed to the MSVC compiler')
 
-env = Environment(options = opts, CCFLAGS=['${CFLAGS}'])
+env = Environment(options = opts)
+
+if env['CC'] == 'gcc':
+    env.Append(CCFLAGS=['${GCCFLAGS}'])
+elif env['CC'] == 'cl':
+    env.Append(CCFLAGS=['${MSVCFLAGS}'])
 
 Help(opts.GenerateHelpText(env))
@@ -14 +20 @@
 if sys.platform == 'win32':
     # Prefer MinGW over MSVC
-    env['TOOLS'] = 'mingw'
+    envPrepend(TOOLS=['mingw'])
 
     python_include = os.path.join(sys.exec_prefix, 'include')
@@ -20 +26 @@
     # else it won't work right.
     python_libdir = os.path.join(sys.exec_prefix, 'libs')
-    try:
-        env['LIBPATH'] += [python_libdir]
-    except KeyError:
-        env['LIBPATH'] = [python_libdir]
-    python_libname = 'python%d%d' % (sys.version_info[0], sys.version_info[1])
-    try:
-        env['LIBS'] += [python_libname]
-    except KeyError:
-        env['LIBS'] = [python_libname]
+    env.Append(LIBPATH=[python_libdir])
+    python_libname = 'python%d%d' % (sys.version_info[0:2])
+    env.Append(LIBS=[python_libname])
 else:
     python_include = os.path.join(os.path.join(sys.exec_prefix, 'include'),
@@ -43 +43 @@
     package called something like python2.3-dev""" %headerfile
 
-try:
-    env['CPPPATH'] += [python_include]
-except KeyError:
-    env['CPPPATH'] = [python_include]
+env.Append(CPPPATH=[python_include])
 
 Export('env')

build_options.py

@@ -1 +1 @@
 # Build configuration for ANUGA
 
-# Flags to pass to the C Compiler
-CFLAGS = '-O3 -Wall'
+# Flags to pass to GCC
+GCCFLAGS = '-O3 -Wall'
+
+# Flags to pass to MSVC Compiler
+MSVCFLAGS = '/Wall'

inundation/mesh_engine/SConscript

@@ -1 +1 @@
 Import('env')
 env2 = env.Copy()
-
-try:
-    env2['CPPDEFINES'] += [('TRILIBRARY', 1), ('NO_TIMER', 1)]
-except KeyError:
-    env2['CPPDEFINES'] = [('TRILIBRARY', 1), ('NO_TIMER', 1)]
+env2.Append(CPPDEFINES=[('TRILIBRARY', 1), ('NO_TIMER', 1)])
 
 env2.SharedLibrary('triang', ['triangle.c', 'triang.c'])

inundation/pyvolution/SConscript

@@ -1 +1 @@
 Import('env')
 env2 = env.Copy()
-env2['CPPPATH'] += ['#inundation/utilities']
+env2.Append(CPPPATH=['#inundation/utilities'])
 
 env2.SharedLibrary('quantity_ext', ['quantity_ext.c'])