[cig-commits] r5846 - long/3D/Gale/trunk

[walter at geodynamics.org]

Author: walter
Date: 2007-01-19 14:48:59 -0800 (Fri, 19 Jan 2007)
New Revision: 5846

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct
   long/3D/Gale/trunk/configure_vars.in
Log:
 r1459 at earth:  boo | 2007-01-19 14:47:54 -0800
 More MSVC fixes



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1457
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1459

Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct	2007-01-19 22:45:16 UTC (rev 5845)
+++ long/3D/Gale/trunk/SConstruct	2007-01-19 22:48:59 UTC (rev 5846)
@@ -29,10 +29,7 @@
 
 env=Environment(ENV=os.environ)
 
-env.Append(CCFLAGS=['-g'])
-
 env.Append(CPPPATH=['#/build/include'])
-env.Append(CPPFLAGS=['-DVERSION=\\"CIG\\"','-DHAVE_PETSC'])
 # Export all of the variables 
 Export('env')
 
@@ -40,11 +37,6 @@
 
 Import('env','with_shared','mpirun','extra_libs','libs')
 
-
-if not with_shared:
-    with_shared=False
-    env.Append(CPPFLAGS=['-DNOSHARED'])
-
 # Set up stuff for a static build
 
 env.Append(FRAMEWORKS=["vecLib"])

Modified: long/3D/Gale/trunk/configure_vars.in
===================================================================
--- long/3D/Gale/trunk/configure_vars.in	2007-01-19 22:45:16 UTC (rev 5845)
+++ long/3D/Gale/trunk/configure_vars.in	2007-01-19 22:48:59 UTC (rev 5846)
@@ -25,6 +25,8 @@
 env['CC']='@CC@'
 env['LINK']='@CC@'
 
+env.Append(CCFLAGS=['-g'])
+env.Append(CPPFLAGS=['-DVERSION=\\"CIG\\"','-DHAVE_PETSC'])
 
 if '@CFLAGS@':
     env.Append(CCFLAGS=Split('@CFLAGS@'))
@@ -36,6 +38,7 @@
 with_shared=True
 if not '@WITH_SHARED@':
     with_shared=False
+    env.Append(CPPFLAGS=['-DNOSHARED'])
 
 # Add in the size of long
 env.Append(CPPFLAGS=['-DSYSTEM_SIZEOF_LONG=@SIZEOF_LONG@'])