/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1247 by ksteube, Tue Aug 14 01:29:20 2007 UTC revision 1248 by phornby, Tue Aug 14 05:20:39 2007 UTC
# Line 331  try: Line 331  try:
331     libinstall = env['libinstall']     libinstall = env['libinstall']
332     env.Append(LIBPATH = [libinstall,]) # Adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so     env.Append(LIBPATH = [libinstall,]) # Adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so
333     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
334     if env['PLATFORM'] == "win32":     if IS_WINDOWS_PLATFORM :
335        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)
       env.PrependENVPath('PATH', env['boost_lib_path'])  
336  except KeyError:  except KeyError:
337     libinstall = None     libinstall = None
338  try:  try:
# Line 567  if useNetCDF == 'yes': Line 566  if useNetCDF == 'yes':
566    
567     try:     try:
568        lib_path = env['netCDF_lib_path']        lib_path = env['netCDF_lib_path']
       if IS_WINDOWS_PLATFORM: env['ENV']['PATH']+=";"+lib_path  
569        env.Append(LIBPATH = [ lib_path, ])        env.Append(LIBPATH = [ lib_path, ])
570          if IS_WINDOWS_PLATFORM :
571             env.PrependENVPath('PATH', lib_path)
572     except KeyError:     except KeyError:
573        pass        pass
574  else:  else:
# Line 583  except KeyError: Line 583  except KeyError:
583  try:  try:
584     lib_path = env['boost_lib_path']     lib_path = env['boost_lib_path']
585     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
586       if IS_WINDOWS_PLATFORM :
587          env.PrependENVPath('PATH', lib_path)
588  except KeyError:  except KeyError:
589     pass     pass
590  try:  try:
Legend:
Removed from v.1247  
changed lines
  Added in v.1248
  ViewVC Help
Powered by ViewVC 1.1.26