/[ascend]/trunk/ascxx/SConscript
ViewVC logotype

Diff of /trunk/ascxx/SConscript

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

revision 2714 by jpye, Sat Aug 17 10:57:58 2013 UTC revision 2715 by jpye, Sun Sep 1 12:29:23 2013 UTC
# Line 77  if platform.system()=="Windows": Line 77  if platform.system()=="Windows":
77      if env.get('LIBS') and 'msvcr71' in env['LIBS']:      if env.get('LIBS') and 'msvcr71' in env['LIBS']:
78          swig_env.Append(CPPDEFINES=['HAVE_MSVCR71'])          swig_env.Append(CPPDEFINES=['HAVE_MSVCR71'])
79      swig_env.Append(LINKFLAGS="-static-libgcc ")      swig_env.Append(LINKFLAGS="-static-libgcc ")
80        #TDM-GCC not *not* require or support the following:
81        #swig_env.Append(LINKFLAGS="-static-libstdc++")
82    
83  elif platform.system()=="Darwin":  elif platform.system()=="Darwin":
84      swig_env['SHLIBSUFFIX']='.so'      swig_env['SHLIBSUFFIX']='.so'
# Line 100  for swigf in Split(""" Line 102  for swigf in Split("""
102  swig_env.Append(LIBS = ['ascend']+env['PYTHON_LIB'])  swig_env.Append(LIBS = ['ascend']+env['PYTHON_LIB'])
103  swig_env.Append(LIBPATH = ['#'] + env['PYTHON_LIBPATH'])  swig_env.Append(LIBPATH = ['#'] + env['PYTHON_LIBPATH'])
104  swig_env.Append(LINKFLAGS=env['PYTHON_LINKFLAGS'])  swig_env.Append(LINKFLAGS=env['PYTHON_LINKFLAGS'])
   
 libcxx = 'link'  
 if env.get('MSVS'):  
     libcxx = None  
 if platform.system()=="Windows" and env.get('HAVE_GCC'):  
     libcxx = 'static'  
   
 if libcxx == 'link':      
     swig_env.Append(LIBS = ['stdc++'])  
 elif libcxx == 'static':  
     pass #swig_env.Append(LINKFLAGS = ['-static-libstdc++'])  
105            
106  if env.get('WITH_DMALLOC'):  if env.get('WITH_DMALLOC'):
107      swig_env.Append(LIBS = ['dmalloc'])      swig_env.Append(LIBS = ['dmalloc'])
Legend:
Removed from v.2714  
changed lines
  Added in v.2715
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22