Ver código fonte

Get packpanda work with the new direct/src->direct/ changes

rdb 17 anos atrás
pai
commit
beeeedbb5e

+ 11 - 3
direct/src/directscripts/packpanda.nsi

@@ -93,12 +93,20 @@ Section "${SMDIRECTORY}" SecCore
         File /r "${PANDA}\bin\Microsoft.VC90.CRT.manifest"
         File /r "${PANDA}\bin\Microsoft.VC90.CRT.manifest"
         SetOutPath $INSTDIR\etc
         SetOutPath $INSTDIR\etc
         File /r "${PANDACONF}\*"
         File /r "${PANDACONF}\*"
-        SetOutPath $INSTDIR\direct\src\directscripts
+        SetOutPath $INSTDIR\direct\directscripts
+        !ifdef PPGAME
+        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\directscripts\*"
+        SetOutPath $INSTDIR\direct\filter
+        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\filter\*.sha"
+        SetOutPath $INSTDIR\direct
+        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\*.py"
+        !else
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\directscripts\*"
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\directscripts\*"
-        SetOutPath $INSTDIR\direct\src\filter
+        SetOutPath $INSTDIR\direct\filter
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\filter\*.sha"
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\filter\*.sha"
         SetOutPath $INSTDIR\direct
         SetOutPath $INSTDIR\direct
-        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\*.py"
+        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\*.py"
+        !endif
         File "${PANDA}\direct\__init__.py"
         File "${PANDA}\direct\__init__.py"
         SetOutPath $INSTDIR\pandac
         SetOutPath $INSTDIR\pandac
         File /r "${PANDA}\pandac\*.py"
         File /r "${PANDA}\pandac\*.py"

+ 1 - 1
direct/src/directscripts/packpanda.py

@@ -369,7 +369,7 @@ if (sys.platform == "win32"):
     CMD=CMD+'/DPPGAME="'+TMPGAME+'" '
     CMD=CMD+'/DPPGAME="'+TMPGAME+'" '
     CMD=CMD+'/DPPMAIN="'+MAIN+'" '
     CMD=CMD+'/DPPMAIN="'+MAIN+'" '
     CMD=CMD+'/DPPICON="'+PPICON+'" '
     CMD=CMD+'/DPPICON="'+PPICON+'" '
-    CMD=CMD+'"'+PSOURCE+'\\direct\\src\\directscripts\\packpanda.nsi"' 
+    CMD=CMD+'"'+PSOURCE+'\\direct\\directscripts\\packpanda.nsi"' 
     
     
     print ""
     print ""
     print CMD
     print CMD