/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1137 by gross, Thu May 10 08:11:31 2007 UTC revision 1141 by gross, Tue May 15 04:24:51 2007 UTC
# Line 57  else: Line 57  else:
57           hostname+=s           hostname+=s
58        else:        else:
59           hostname+="_"           hostname+="_"
60     options_file = "scons"+os.sep+hostname+"_options.py"     options_file = os.path.join("scons",hostname+"_options.py")
61        
62  if os.path.isfile(options_file):  if os.path.isfile(options_file):
63     print "option file is ",options_file,"."     print "option file is ",options_file,"."
# Line 135  else: Line 135  else:
135  netCDF_path_default=None  netCDF_path_default=None
136  netCDF_lib_path_default=None  netCDF_lib_path_default=None
137  netCDF_libs_default=None  netCDF_libs_default=None
138  useNetCDF_default='yes'  useNetCDF_default='no'
139  if os.path.isdir(tools_prefix+'netcdf'+os.sep+'include') and os.path.isdir(tools_prefix+'netcdf'+os.sep+'lib'):  netcdf_dir=os.path.join(tools_prefix,'netcdf')
140       netCDF_path_default=tools_prefix+'netcdf'+os.sep+'include'  if os.path.isdir(os.path.join(netcdf_dir,'include')) and os.path.isdir(os.path.join(netcdf_dir,'lib')):
141       netCDF_lib_path_default=tools_prefix+'netcdf'+os.sep+'lib'       netCDF_path_default=os.path.join(netcdf_dir,'include')
142         netCDF_lib_path_default=os.path.join(netcdf_dir,'lib')
143       netCDF_libs_default=['netcdf_cpp',  'netcdf' ]       netCDF_libs_default=['netcdf_cpp',  'netcdf' ]
144       useNetCDF_default='no'       if IS_WINDOWS_PLATFORM:
145            useNetCDF_default='no' # be default netcdf is not supported on windows.
146         else:
147            useNetCDF_default='yes'
148  #==========================================================================  #==========================================================================
149  #  #
150  #    compile:  #    compile:
# Line 148  if os.path.isdir(tools_prefix+'netcdf'+o Line 152  if os.path.isdir(tools_prefix+'netcdf'+o
152  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
153      # cc_flags_default  = '/GR /EHsc /MD /Qc99 /Qopenmp /Qopenmp-report1 /O3 /G7 /Qprec /Qpar-report1 /QxP /QaxP'      # cc_flags_default  = '/GR /EHsc /MD /Qc99 /Qopenmp /Qopenmp-report1 /O3 /G7 /Qprec /Qpar-report1 /QxP /QaxP'
154      # cc_flags_debug_default  = '/Od /MDd /RTC1 /GR /EHsc /Qc99 /Qopenmp /Qopenmp-report1 /Qprec'      # cc_flags_debug_default  = '/Od /MDd /RTC1 /GR /EHsc /Qc99 /Qopenmp /Qopenmp-report1 /Qprec'
155      cc_flags_default  = '/FD /EHsc /GR  /wd4068 /O2 /Op /MT /W3'      cc_flags_default  = '/nologo /EHsc /GR  /wd4068 /O2 /Op /MT /W3 /Ob0 /Z7'
156      cc_flags_debug_default  ='/FD /EHsc /GR  /wd4068 /Od /RTC1 /MTd /ZI'      cc_flags_debug_default  ='/nologo /EHsc /GR  /wd4068 /Od /RTC1 /MTd /ZI /Ob0 /Z7'
157        
158        cc_flags_default  = '/nologo /EHsc /GR  /O2 /MT /W3 /Ob0 /Z7 /wd4068'
159        cc_flags_debug_default  ='/nologo /EHsc /GR /Od /RTC1 /MTd /W3 /Ob0 /Z7/wd4068'
160      cxx_flags_default = ''      cxx_flags_default = ''
161      cxx_flags_debug_default = ''      cxx_flags_debug_default = ''
162      cc_common_flags = '/FD /EHsc /GR /wd4068 '      cc_common_flags = '/FD /EHsc /GR /wd4068 '
Legend:
Removed from v.1137  
changed lines
  Added in v.1141
  ViewVC Help
Powered by ViewVC 1.1.26