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

Diff of /trunk/pygtk/SConscript

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

revision 551 by johnpye, Wed Apr 26 15:15:40 2006 UTC revision 552 by johnpye, Sat Apr 29 08:53:04 2006 UTC
# Line 26  python_env.Replace( Line 26  python_env.Replace(
26    
27  import platform  import platform
28    
29  if platform.system()=='Windows' and env.has_key('MSVS'):  if platform.system()=='Windows' and env.get('MSVS'):
30      python_env.Append(CCFLAGS=['/EHsc']) # for exceptions (as suggested by a MSVC error msg, dunno if it's right or not -- JP)      python_env.Append(CCFLAGS=['/EHsc']) # for exceptions (as suggested by a MSVC error msg, dunno if it's right or not -- JP)
31    
32  swig_has_gccvisibility = False  swig_has_gccvisibility = False
# Line 34  min,maj,pat = env['SWIGVERSION'] Line 34  min,maj,pat = env['SWIGVERSION']
34  if min==1 and maj==3 and pat>=29:  if min==1 and maj==3 and pat>=29:
35      swig_has_gccvisibility = True      swig_has_gccvisibility = True
36    
37  if env.has_key('HAVE_GCC'):  if env.get('HAVE_GCC'):
38      python_env.Append(CPPFLAGS=['-O3'])      python_env.Append(CPPFLAGS=['-O3'])
39      if swig_has_gccvisibility and env.has_key('HAVE_GCCVISIBILITY'):      if swig_has_gccvisibility and env.has_key('HAVE_GCCVISIBILITY'):
40          python_env.Append(CCFLAGS=['-fvisibility=hidden']);          python_env.Append(CCFLAGS=['-fvisibility=hidden']);
# Line 95  if platform.system() != "Windows" or env Line 95  if platform.system() != "Windows" or env
95  #---------------------------------------------  #---------------------------------------------
96  # INSTALLATION  # INSTALLATION
97    
98  if env.has_key('CAN_INSTALL') and env['CAN_INSTALL']:  if env.get('CAN_INSTALL'):
99      env.InstallProgram(env['INSTALL_ROOT']+env['INSTALL_BIN'],ascendcmd)      env.InstallProgram(env['INSTALL_ROOT']+env['INSTALL_BIN'],ascendcmd)
100    
101      import glob      import glob
# Line 108  if env.has_key('CAN_INSTALL') and env['C Line 108  if env.has_key('CAN_INSTALL') and env['C
108    
109      env.Install(env['INSTALL_ROOT']+env['INSTALL_DATA']+"/ascend/",swiglib)      env.Install(env['INSTALL_ROOT']+env['INSTALL_DATA']+"/ascend/",swiglib)
110    
111  if env.has_key('WITH_INSTALLER') and env['WITH_INSTALLER']:  if env.get('WITH_INSTALLER'):
112      import platform      import platform
113      if platform.system()=="Windows":      if platform.system()=="Windows":
114          installer = env.Nsis('create.nsi')          installer = env.Nsis('create.nsi')

Legend:
Removed from v.551  
changed lines
  Added in v.552

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22