RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a packpanda bug

This commit is contained in:
Josh Yelon 2005-11-18 19:13:23 +00:00
parent 47f189b142
commit a5bb442960
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
direct/src/directscripts/packpanda.nsi
View File

@ -90,8 +90,9 @@ Section "${SMDIRECTORY}" SecCore
File /r ${PANDA}\etc\*
SetOutPath $INSTDIR\direct
File /r /x CVS /x Opt?-Win32 ${PSOURCE}\direct\*.py
File /r /x CVS /x Opt?-Win32 ${PSOURCE}\direct\src\directscripts\*
File ${PANDA}\direct\__init__.py
SetOutPath $INSTDIR\direct\src\directscripts
File /r /x CVS /x Opt?-Win32 ${PSOURCE}\direct\src\directscripts\*
SetOutPath $INSTDIR\pandac
File /r ${PANDA}\pandac\*.py
SetOutPath $INSTDIR\python
@ -205,12 +206,6 @@ Section -post
Call AddToPath
!endif
DetailPrint "Registering Helix Preferences..."
WriteRegStr HKLM "Software\Helix\HelixSDK\10.0\Preferences\UseOverlay" "" "0"
WriteRegStr HKLM "Software\Helix\HelixSDK\10.0\Preferences\UseWinDraw" "" "0"
WriteRegStr HKCU "Software\Helix\HelixSDK\10.0\Preferences\UseOverlay" "" "0"
WriteRegStr HKCU "Software\Helix\HelixSDK\10.0\Preferences\UseWinDraw" "" "0"
DetailPrint "Adding the uninstaller ..."
Delete "$INSTDIR\uninst.exe"
WriteUninstaller "$INSTDIR\uninst.exe"

5
direct/src/directscripts/packpanda.py
View File

@ -69,12 +69,13 @@ OPTIONS = ParseOptions(sys.argv[1:])
PANDA=None
for dir in sys.path:
if os.path.exists(os.path.join(dir,"direct")) and os.path.exists(os.path.join(dir,"pandac")) and os.path.exists(os.path.join(dir,"python")):
if (dir != "") and os.path.exists(os.path.join(dir,"direct")) and os.path.exists(os.path.join(dir,"pandac")) and os.path.exists(os.path.join(dir,"python")) and os.path.exists(os.path.join(dir,"nsis")):
PANDA=os.path.abspath(dir)
if (PANDA is None):
sys.exit("Cannot locate the panda root directory in the python path (cannot locate directory containing direct and pandac).")
print "PANDA located at "+PANDA
if (os.path.exists(os.path.join("PANDA","..","makepanda","makepanda.py"))) and (os.path.exists(os.path.join("PANDA","..","thirdparty","win-nsis","makensis.exe"))):
if (os.path.exists(os.path.join(PANDA,"..","makepanda","makepanda.py"))) and (os.path.exists(os.path.join(PANDA,"..","thirdparty","win-nsis","makensis.exe"))):
PSOURCE=os.path.abspath(os.path.join(PANDA,".."))
NSIS=os.path.abspath(os.path.join(PANDA,"..","thirdparty","win-nsis"))
else: