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

Diff of /trunk/dudley/src/SConscript

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

revision 3736 by jfenwick, Thu Nov 17 00:53:38 2011 UTC revision 3737 by caltinay, Tue Dec 13 00:04:39 2011 UTC
# Line 127  cppadapter_headers = """ Line 127  cppadapter_headers = """
127      CPPAdapter/system_dep.h      CPPAdapter/system_dep.h
128  """.split()  """.split()
129    
130  local_env.Prepend(LIBS = ['escript', 'esysUtils', 'paso', 'pasowrap'])  local_env.Prepend(LIBS = ['pasowrap', 'escript', 'paso', 'esysUtils'])
131    
132  if IS_WINDOWS :  if IS_WINDOWS :
133    local_env.Append(CPPDEFINES = ['DUDLEY_EXPORTS'])    local_env.Append(CPPDEFINES = ['DUDLEY_EXPORTS'])
# Line 150  lib_inst = local_env.Install(local_env[' Line 150  lib_inst = local_env.Install(local_env['
150  env.Alias('install_dudley_lib', lib_inst)  env.Alias('install_dudley_lib', lib_inst)
151    
152  ### Python wrapper ###  ### Python wrapper ###
153  py_wrapper_local_env.Prepend(LIBS = ['dudley', 'escript', 'esysUtils', 'paso', 'pasowrap'])  if not env['build_shared']:
154        py_wrapper_local_env.Prepend(LIBS = ['dudley', 'pasowrap', 'escript'])
155    else:
156        py_wrapper_local_env.Prepend(LIBS = ['dudley', 'pasowrap', 'escript', 'paso', 'esysUtils'])
157  py_wrapper_name = module_name + 'cpp'  py_wrapper_name = module_name + 'cpp'
158  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/dudleycpp.cpp')  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/dudleycpp.cpp')
159  env.Alias('build_dudleycpp_lib', py_wrapper_lib)  env.Alias('build_dudleycpp_lib', py_wrapper_lib)

Legend:
Removed from v.3736  
changed lines
  Added in v.3737

  ViewVC Help
Powered by ViewVC 1.1.26