/[escript]/trunk/escript/src/SConscript
ViewVC logotype

Diff of /trunk/escript/src/SConscript

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

revision 2826 by jfenwick, Wed Nov 25 01:24:51 2009 UTC revision 2827 by jfenwick, Fri Dec 18 03:41:09 2009 UTC
# Line 15  import os Line 15  import os
15  Import('*')  Import('*')
16    
17  local_env = clone_env(env_mpi)  local_env = clone_env(env_mpi)
18    local_dodgy = clone_env(dodgy_env)
19  py_wrapper_local_env = clone_env(env_mpi)  py_wrapper_local_env = clone_env(env_mpi)
20    
21  # Remove the sharedlibrary prefix on all platform - we don't want 'lib' mucking with our python modules  # Remove the sharedlibrary prefix on all platform - we don't want 'lib' mucking with our python modules
# Line 77  headers = """ Line 78  headers = """
78      DataTagged.h      DataTagged.h
79      DataTypes.h      DataTypes.h
80      DataVector.h      DataVector.h
81        Dodgy.h
82      DomainException.h      DomainException.h
83      EscriptParams.h      EscriptParams.h
84      FunctionSpace.h      FunctionSpace.h
# Line 100  headers = """ Line 102  headers = """
102  """.split()  """.split()
103      # blocktimer.h      # blocktimer.h
104    
105    dodgy_sources = """
106        Dodgy.cpp
107    """.split()
108    
109  local_env.Append(LIBS = [ 'esysUtils'] + env['sys_libs'] )  local_env.Append(LIBS = [ 'esysUtils'] + env['sys_libs'] )
110    local_dodgy.Append(LIBS = [ 'esysUtils'] + env['sys_libs'] )
111    
112  if IS_WINDOWS_PLATFORM :  if IS_WINDOWS_PLATFORM :
113    local_env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS'])    local_env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS'])
114      local_dodgy.Append(CPPDEFINES = ['ESCRIPT_EXPORTS'])
115    
116  py_wrapper_local_env.Append(LIBS = [ 'escript', 'esysUtils'] + env['sys_libs'])  py_wrapper_local_env.Append(LIBS = [ 'escript', 'esysUtils'] + env['sys_libs'])
117    
118  module_name = 'escript'  module_name = 'escript'
119  py_wrapper_name = module_name + 'cpp'  py_wrapper_name = module_name + 'cpp'
120    
121  lib = local_env.SharedLibrary(module_name, sources)  #Specify to build shared object
122    if local_env['iknowwhatimdoing']:
123       nonped=[local_dodgy.SharedObject(x) for x in dodgy_sources]
124    else:
125       nonped=[]
126    
127    lib = local_env.SharedLibrary(module_name, sources+nonped)
128  env.Alias('target_escript_so', lib)  env.Alias('target_escript_so', lib)
129    
130  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'escriptcpp.cpp')  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'escriptcpp.cpp')

Legend:
Removed from v.2826  
changed lines
  Added in v.2827

  ViewVC Help
Powered by ViewVC 1.1.26