/[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 1022 by gross, Tue Feb 6 07:01:11 2007 UTC revision 1023 by gross, Tue Mar 13 05:43:36 2007 UTC
# Line 21  headers = [x for x in filenames if os.pa Line 21  headers = [x for x in filenames if os.pa
21  # Filter out sources that should not be in the list automatically  # Filter out sources that should not be in the list automatically
22  sources.remove(py_wrapper_source) # FIXME: should probably refactor the source tree so the python wrapper isn't colocated with c++ sources  sources.remove(py_wrapper_source) # FIXME: should probably refactor the source tree so the python wrapper isn't colocated with c++ sources
23    
24  local_env.Append(LIBS = [boost_lib, 'esysUtils', sys_libs ] + netCDF_libs_cxx)  local_env.Append(LIBS = [boost_lib, 'esysUtils', sys_libs ] )
25  py_wrapper_local_env.Append(LIBS = [boost_lib, lib_name, 'esysUtils', sys_libs ] + netCDF_libs_cxx)  py_wrapper_local_env.Append(LIBS = [boost_lib, lib_name, 'esysUtils', sys_libs ] )
26    if useNetCDF == 'yes':
27        local_env.Append(LIBS = netCDF_libs_cxx)
28        local_env.Append(CPPDEFINES = [ 'USE_NETCFD' ])
29        py_wrapper_local_env.Append(LIBS = netCDF_libs_cxx)
30        py_wrapper_local_env.Append(CPPDEFINES = [ 'USE_NETCFD' ])
31    
32  local_env.Append(CPPDEFINES = 'ESCRIPT_EXPORTS')  local_env.Append(CPPDEFINES = [ 'ESCRIPT_EXPORTS'] )
33    
34  lib = local_env.SharedLibrary(lib_name, sources)  lib = local_env.SharedLibrary(lib_name, sources)
35  py_wrapper_lib = py_wrapper_local_env.SharedLibrary( py_wrapper_lib_name, py_wrapper_source)  py_wrapper_lib = py_wrapper_local_env.SharedLibrary( py_wrapper_lib_name, py_wrapper_source)
Legend:
Removed from v.1022  
changed lines
  Added in v.1023
  ViewVC Help
Powered by ViewVC 1.1.26