mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
Changes to ppgame stuff
This commit is contained in:
parent
0c519fbc4f
commit
9768307f57
@ -6230,7 +6230,7 @@ if (sys.platform == "win32"):
|
|||||||
def4 = '/DINSTALLDIR="' + installdir + '" '
|
def4 = '/DINSTALLDIR="' + installdir + '" '
|
||||||
def5 = ''
|
def5 = ''
|
||||||
if (ppgame): def5 = '/DPPGAME="' + ppgame + '" '
|
if (ppgame): def5 = '/DPPGAME="' + ppgame + '" '
|
||||||
oscmd("thirdparty/win-nsis/makensis.exe /V2 "+def0+def1+def2+def3+def4+def5+" thirdparty/win-nsis/panda.nsi")
|
oscmd("thirdparty/win-nsis/makensis.exe /V2 "+def0+def1+def2+def3+def4+def5+" makepanda/panda.nsi")
|
||||||
os.rename("nsis-output.exe", file)
|
os.rename("nsis-output.exe", file)
|
||||||
|
|
||||||
if (INSTALLER!=0):
|
if (INSTALLER!=0):
|
||||||
@ -6242,7 +6242,7 @@ if (sys.platform == "win32"):
|
|||||||
sys.exit("No such directory "+PPGAME)
|
sys.exit("No such directory "+PPGAME)
|
||||||
if (os.path.exists(os.path.join(PPGAME,PPGAME+".py"))==0):
|
if (os.path.exists(os.path.join(PPGAME,PPGAME+".py"))==0):
|
||||||
sys.exit("No such file "+PPGAME+"/"+PPGAME+".py")
|
sys.exit("No such file "+PPGAME+"/"+PPGAME+".py")
|
||||||
MakeInstaller(PPGAME+"-"+VERSION+".exe", PPGAME, PPGAME,
|
MakeInstaller(PPGAME+"-"+VERSION+".exe", PPGAME+" "+VERSION, PPGAME+" "+VERSION,
|
||||||
PPGAME+" "+VERSION, "C:\\"+PPGAME+"-"+VERSION, PPGAME)
|
PPGAME+" "+VERSION, "C:\\"+PPGAME+"-"+VERSION, PPGAME)
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,8 +12,8 @@
|
|||||||
; INSTALLDIR - where to install the program (ie, "C:\Panda3D-VERSION")
|
; INSTALLDIR - where to install the program (ie, "C:\Panda3D-VERSION")
|
||||||
; PPGAME - only if making a prepackaged game. (ie, "Airblade")
|
; PPGAME - only if making a prepackaged game. (ie, "Airblade")
|
||||||
|
|
||||||
!define PANDA ..\..\built
|
!define PANDA ..\built
|
||||||
!define PSOURCE ..\..
|
!define PSOURCE ..
|
||||||
|
|
||||||
; Use the Modern UI
|
; Use the Modern UI
|
||||||
!include "MUI.nsh"
|
!include "MUI.nsh"
|
||||||
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
Name "${FULLNAME}"
|
Name "${FULLNAME}"
|
||||||
InstallDir "${INSTALLDIR}"
|
InstallDir "${INSTALLDIR}"
|
||||||
OutFile "..\..\nsis-output.exe"
|
OutFile "..\nsis-output.exe"
|
||||||
|
|
||||||
SetCompress auto
|
SetCompress auto
|
||||||
SetCompressor ${COMPRESSOR}
|
SetCompressor ${COMPRESSOR}
|
||||||
@ -67,7 +67,8 @@ Section "${FULLNAME}" SecCore
|
|||||||
File /r /x CVS /x Opt?-Win32 ${PSOURCE}\direct\*.py
|
File /r /x CVS /x Opt?-Win32 ${PSOURCE}\direct\*.py
|
||||||
File ${PANDA}\direct\__init__.py
|
File ${PANDA}\direct\__init__.py
|
||||||
SetOutPath $INSTDIR\pandac
|
SetOutPath $INSTDIR\pandac
|
||||||
File /r ${PANDA}\pandac\*
|
File /r ${PANDA}\pandac\*.py
|
||||||
|
File /r ${PANDA}\pandac\*.pyz
|
||||||
SetOutPath $INSTDIR\python
|
SetOutPath $INSTDIR\python
|
||||||
File /r /x CVS /x *.pyc ${PANDA}\python\*
|
File /r /x CVS /x *.pyc ${PANDA}\python\*
|
||||||
|
|
||||||
@ -81,10 +82,12 @@ Section "${FULLNAME}" SecCore
|
|||||||
SetOutpath $INSTDIR\${PPGAME}
|
SetOutpath $INSTDIR\${PPGAME}
|
||||||
File /r ${PSOURCE}\${PPGAME}\*
|
File /r ${PSOURCE}\${PPGAME}\*
|
||||||
SetOutPath $INSTDIR\${PPGAME}
|
SetOutPath $INSTDIR\${PPGAME}
|
||||||
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\${FULLNAME}.lnk" "$INSTDIR\bin\ppython.exe" "${PPGAME}.py" "$INSTDIR\bin\ppython.exe" 0 "" "" "${FULLNAME}"
|
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\${FULLNAME}.lnk" "$INSTDIR\bin\ppython.exe" "${PPGAME}.py" "$INSTDIR\bin\ppython.exe" 0 SW_SHOWMINIMIZED "" "${FULLNAME}"
|
||||||
|
|
||||||
!else
|
!else
|
||||||
|
|
||||||
|
SetOutPath $INSTDIR\pandac\input
|
||||||
|
File /r ${PANDA}\pandac\input\*
|
||||||
SetOutPath $INSTDIR\bin
|
SetOutPath $INSTDIR\bin
|
||||||
File /r ${PANDA}\bin\*.exe
|
File /r ${PANDA}\bin\*.exe
|
||||||
SetOutPath $INSTDIR
|
SetOutPath $INSTDIR
|
||||||
|
Loading…
x
Reference in New Issue
Block a user