Fix for missing icon and ppythonw failure

This commit is contained in:
Josh Yelon 2006-05-24 19:12:54 +00:00
parent 2557c64393
commit 69978bbb8d
1 changed files with 9 additions and 9 deletions

View File

@ -90,11 +90,10 @@ Section "${SMDIRECTORY}" SecCore
File /r /x CVS /x *.pyc /x *.map /x *.pdb /x *.exe "${PANDA}\bin\*"
SetOutPath $INSTDIR\etc
File /r "${PANDA}\etc\*"
SetOutPath $INSTDIR\direct
File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\*.py"
SetOutPath $INSTDIR\direct\src\directscripts
File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\directscripts\*"
SetOutPath $INSTDIR\direct
File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\*.py"
File "${PANDA}\direct\__init__.py"
SetOutPath $INSTDIR\pandac
File /r "${PANDA}\pandac\*.py"
@ -107,10 +106,11 @@ Section "${SMDIRECTORY}" SecCore
SetOutPath $INSTDIR\models\audio
File /r /x CVS "${PANDA}\models\audio\*"
SetOutPath $INSTDIR\bin
File /r "${PANDA}\bin\ppythonw.exe"
File /r "${PANDA}\bin\pzip.exe"
File /r "${PANDA}\bin\ppython.exe"
SetOutpath $INSTDIR\game
File /r "${PPGAME}\*"
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Play ${NAME}.lnk" "$INSTDIR\bin\ppythonw.exe" "${PPMAIN}" "$INSTDIR\${PPICON}" 0 SW_SHOWMINIMIZED "" "Play ${NAME}"
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Play ${NAME}.lnk" "$INSTDIR\bin\ppython.exe" "${PPMAIN}" "$INSTDIR\${PPICON}" 0 SW_SHOWMINIMIZED "" "Play ${NAME}"
!else
@ -148,10 +148,10 @@ Section "${SMDIRECTORY}" SecCore
WriteINIStr $INSTDIR\Website.url "InternetShortcut" "URL" "http://panda3d.etc.cmu.edu/"
WriteINIStr $INSTDIR\Manual.url "InternetShortcut" "URL" "http://panda3d.etc.cmu.edu/wiki/index.php"
SetOutPath $INSTDIR\samples\GreetingCard
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Greeting Card.lnk" "$INSTDIR\bin\ppythonw.exe" 'GreetingCard.py "$SMPROGRAMS\${SMDIRECTORY}"' "$INSTDIR\bin\ppythonw.exe" 0 SW_SHOWMINIMIZED "" "Panda Greeting Card"
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Greeting Card.lnk" "$INSTDIR\bin\ppython.exe" 'GreetingCard.py "$SMPROGRAMS\${SMDIRECTORY}"' "$INSTDIR\bin\pzip.exe" 0 SW_SHOWMINIMIZED "" "Panda Greeting Card"
SetOutPath $INSTDIR
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Manual.lnk" "$INSTDIR\Manual.url" "" "$INSTDIR\bin\ppythonw.exe" 0 "" "" "Panda Manual"
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Website.lnk" "$INSTDIR\Website.url" "" "$INSTDIR\bin\ppythonw.exe" 0 "" "" "Panda Website"
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Manual.lnk" "$INSTDIR\Manual.url" "" "$INSTDIR\bin\ppython.exe" 0 "" "" "Panda Manual"
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Website.lnk" "$INSTDIR\Website.url" "" "$INSTDIR\bin\ppython.exe" 0 "" "" "Panda Website"
FindFirst $0 $1 $INSTDIR\samples\*--*
loop:
@ -179,8 +179,8 @@ Section "${SMDIRECTORY}" SecCore
Call StrRep
Pop $R0
StrCpy $TUTNAME $R0
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\$READABLE\Run $TUTNAME.lnk" "$INSTDIR\bin\ppythonw.exe" "$3" "$INSTDIR\bin\ppythonw.exe" 0 SW_SHOWMINIMIZED "" "Run $TUTNAME"
CreateShortCut "$INSTDIR\samples\$1\Run $TUTNAME.lnk" "$INSTDIR\bin\ppythonw.exe" "$3" "$INSTDIR\bin\ppythonw.exe" 0 SW_SHOWMINIMIZED "" "Run $TUTNAME"
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\$READABLE\Run $TUTNAME.lnk" "$INSTDIR\bin\ppython.exe" "$3" "$INSTDIR\bin\pzip.exe" 0 SW_SHOWMINIMIZED "" "Run $TUTNAME"
CreateShortCut "$INSTDIR\samples\$1\Run $TUTNAME.lnk" "$INSTDIR\bin\ppython.exe" "$3" "$INSTDIR\bin\pzip.exe" 0 SW_SHOWMINIMIZED "" "Run $TUTNAME"
FindNext $2 $3
goto iloop
idone: