Changeset 3006

Timestamp:

Aug 14, 2017 3:32:52 PM (6 years ago)

Author:

vondreele

Message:

 

Location:

trunk

Files:

• . (modified) (1 prop)
• fsource/SConstruct (modified) (2 diffs)

trunk

@@ -1 +1 @@
 Exercises
 GSASII.BAT
+binwin2.7

@@ -1 +1 @@
 Exercises
 GSASII.BAT
+binwin2.7

trunk/fsource/SConstruct

@@ -125 +125 @@
 The following options override defaults set in the scons script:
 
-FCompiler=<name>  -- define the name of the fortran compiler, typically g77
-   or gfortran; default is to use g77 on Windows and gfortran elsewhere. If
+FCompiler=<name>  -- define the name of the fortran compiler, typically gnu
+   or gfortran; default is to use gnu on Windows and gfortran elsewhere. If
    you use something other than these, you must also specify F2PYflags.
 
 FORTpath=<path>    -- define a path to the fortran program; default is to use
-   first gfortran (g77 for Windows) found in path
+   first gfortran (gnu for Windows) found in path
 
 FORTflags='string' -- string of options to be used for Fortran
@@ -224 +224 @@
         if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check -m32"'
     elif sys.platform == "win32":
-         if F2PYflags == "": F2PYflags = '--compiler=mingw32 --fcompiler=gfortran --f77flags="-fno-range-check -m64"'
+         if F2PYflags == "": F2PYflags = '--compiler=mingw32 --fcompiler=gnu95 --f77flags="-fno-range-check -m64"'
 elif FCompiler == 'g77':
     if FORTpath == "": FORTpath = G77path
     if sys.platform == "win32":
-        if F2PYflags == "": F2PYflags = '--compiler=mingw32 --fcompiler=g77'
-        if FORTflags == "": FORTflags = ' -w -O2 -fno-automatic -finit-local-zero -malign-double -mwindows'
+        if F2PYflags == "": F2PYflags = '--compiler=mingw32 --fcompiler=gnu'
+        if FORTflags == "": FORTflags = ' -w -O2 -fno-automatic -finit-local-zero -malign-double'
     else:
         if F2PYflags == "": F2PYflags = '--fcompiler=gnu --f77exec=g77 --f77flags="-fno-range-check"'

@@ -1 +1 @@
 Exercises
 GSASII.BAT
+binwin2.7