/[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 1234 by ksteube, Mon May 14 05:12:53 2007 UTC revision 1235 by phornby, Mon Aug 13 00:25:29 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_libs] + ['esysUtils'] + sys_libs )  local_env.Append(LIBS = [boost_lib, 'esysUtils'] + sys_libs )
25  py_wrapper_local_env.Append(LIBS = [boost_libs] + [ lib_name, 'esysUtils'] + sys_libs )  py_wrapper_local_env.Append(LIBS = [boost_lib, lib_name, 'esysUtils'] + sys_libs )
26  if useNetCDF == 'yes':  if useNetCDF == 'yes':
27      local_env.Append(LIBS = netCDF_libs)      local_env.Append(LIBS = netCDF_libs)
28      local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])      local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])
     if IS_WINDOWS_PLATFORM: local_env.Append(CPPDEFINES = [ 'DLL_NETCDF' ])  
29      py_wrapper_local_env.Append(LIBS = netCDF_libs)      py_wrapper_local_env.Append(LIBS = netCDF_libs)
30      py_wrapper_local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])      py_wrapper_local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])
31    

Legend:
Removed from v.1234  
changed lines
  Added in v.1235

  ViewVC Help
Powered by ViewVC 1.1.26