/[escript]/branches/domexper/SConstruct
ViewVC logotype

Diff of /branches/domexper/SConstruct

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

revision 2026 by jfenwick, Tue Nov 11 01:56:54 2008 UTC revision 2027 by phornby, Tue Nov 11 02:52:24 2008 UTC
# Line 191  elif env["CC"] == "cl": Line 191  elif env["CC"] == "cl":
191    pedantic      = ""    pedantic      = ""
192    fatalwarning      = ""    fatalwarning      = ""
193  elif env["CC"] == "icl":  elif env["CC"] == "icl":
194    # intel C on Windows, see windows_msvc71_options.py for a start    # intel C on Windows, see windows_intelc_options.py for a start
195    pedantic      = ""    pedantic      = ""
196    fatalwarning      = ""    fatalwarning      = ""
197    
# Line 263  env.Append(CPPPATH     = [Dir('include')]) Line 263  env.Append(CPPPATH     = [Dir('include')])
263  # Add cc option -L<Escript>/trunk/lib  # Add cc option -L<Escript>/trunk/lib
264  env.Append(LIBPATH      = [Dir(env['libinstall'])])  env.Append(LIBPATH      = [Dir(env['libinstall'])])
265    
 env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS', 'FINLEY_EXPORTS'])  
   
266  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])
267  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])
268    
# Line 571  env.Append(BUILDERS = {'RunPyUnitTest' : Line 569  env.Append(BUILDERS = {'RunPyUnitTest' :
569    
570  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
571    
572  Export(["env", "env_mpi", "clone_env"])  Export(
573      ["env",
574       "env_mpi",
575       "clone_env",
576       "IS_WINDOWS_PLATFORM"
577       ]
578      )
579    
580  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)
581  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)

Legend:
Removed from v.2026  
changed lines
  Added in v.2027

  ViewVC Help
Powered by ViewVC 1.1.26