/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2606 by jpye, Mon Apr 2 23:47:07 2012 UTC revision 2607 by jpye, Tue Apr 24 23:16:19 2012 UTC
# Line 2829  if not env.get('NSIS'): Line 2829  if not env.get('NSIS'):
2829  if with_installer:  if with_installer:
2830      pyarch = ""      pyarch = ""
2831      ipoptdllline = ""      ipoptdllline = ""
2832      inst64 = 0      instarch = "win32"
2833      ipoptf1 = ""      ipoptf1 = ""
2834      ipoptf2 = ""      ipoptf2 = ""
2835      if platform.architecture()[0] == "64bit":      if platform.architecture()[0] == "64bit":
2836            instarch = "x64"
2837          pyarch = ".amd64"          pyarch = ".amd64"
2838          inst64 = 1          inst64 = 1
2839      if env['IPOPT_DLL']:      if env['IPOPT_DLL']:
# Line 2846  if with_installer: Line 2847  if with_installer:
2847          ,'IPOPTDLL_LINE':ipoptf1          ,'IPOPTDLL_LINE':ipoptf1
2848          ,'IPOPTDLL_LINE2':ipoptf2          ,'IPOPTDLL_LINE2':ipoptf2
2849          ,'PYARCH':str(pyarch)          ,'PYARCH':str(pyarch)
2850          ,'INST64':str(inst64)          ,'INSTARCH':str(instarch)
2851      })      })
2852      installer = env.Installer('nsis/installer.nsi')      installer = env.Installer('nsis/installer.nsi')
2853      env.Depends(installer,["pygtk","ascxx","tcltk","ascend.dll","models","solvers","ascend-config",'pygtk/ascend'])      env.Depends(installer,["pygtk","ascxx","tcltk","ascend.dll","models","solvers","ascend-config",'pygtk/ascend'])

Legend:
Removed from v.2606  
changed lines
  Added in v.2607

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