From ed482efbe77284e1bd4c2b8ca6d99d1ae46007bf Mon Sep 17 00:00:00 2001
From: Josh Yelon <jyelon@gmail.com>
Date: Tue, 19 Sep 2006 02:40:23 +0000
Subject: [PATCH] Finalizing 1.2.992

---
 direct/src/directscripts/packpanda.nsi | 6 +++---
 doc/makepanda/makepanda.py             | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/direct/src/directscripts/packpanda.nsi b/direct/src/directscripts/packpanda.nsi
index 842e5945d7..2fab58c96e 100755
--- a/direct/src/directscripts/packpanda.nsi
+++ b/direct/src/directscripts/packpanda.nsi
@@ -74,7 +74,7 @@ Function runFunction
         ExecShell "open" "$SMPROGRAMS\${SMDIRECTORY}\Play ${NAME}.lnk"
         !else
         ExecShell "open" "$SMPROGRAMS\${SMDIRECTORY}\Panda Greeting Card.lnk"
-        !endif        
+        !endif
 FunctionEnd
 
 Section "${SMDIRECTORY}" SecCore
@@ -151,8 +151,8 @@ Section "${SMDIRECTORY}" SecCore
             SetOutPath $INSTDIR\samples\GreetingCard
             CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Greeting Card.lnk" "$INSTDIR\python\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\python\ppython.exe" 0 "" "" "Panda Manual"
-            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Website.lnk" "$INSTDIR\Website.url" "" "$INSTDIR\python\ppython.exe" 0 "" "" "Panda Website"
+            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Manual.lnk" "$INSTDIR\Manual.url" "" "$INSTDIR\bin\pzip.exe" 0 "" "" "Panda Manual"
+            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Website.lnk" "$INSTDIR\Website.url" "" "$INSTDIR\bin\pzip.exe" 0 "" "" "Panda Website"
 
             FindFirst $0 $1 $INSTDIR\samples\*--*
             loop:
diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py
index 75186da898..29ff34b774 100755
--- a/doc/makepanda/makepanda.py
+++ b/doc/makepanda/makepanda.py
@@ -958,10 +958,10 @@ def CompileCxxMSVC7(wobj,fullsrc,ipath,opts):
     if (opts.count("WITHINPANDA")): cmd = cmd + ' /DWITHIN_PANDA'
     if (opts.count("MSFORSCOPE")==0): cmd = cmd + ' /Zc:forScope'
     optlevel = getoptlevel(opts,OPTIMIZE)
-    if (optlevel==1): cmd = cmd + " /MD /Zi /DNDEBUG /RTCs /GS"
-    if (optlevel==2): cmd = cmd + " /MD /Zi /DNDEBUG "
-    if (optlevel==3): cmd = cmd + " /MD /Zi /DNDEBUG /O2 /Ob2 /DFORCE_INLINING "
-    if (optlevel==4): cmd = cmd + " /MD /Zi /DNDEBUG /Ox /Ob2 /DFORCE_INLINING /GL "
+    if (optlevel==1): cmd = cmd + " /MD /Zi /RTCs /GS"
+    if (optlevel==2): cmd = cmd + " /MD /Zi "
+    if (optlevel==3): cmd = cmd + " /MD /Zi /O2 /Ob2 /DFORCE_INLINING "
+    if (optlevel==4): cmd = cmd + " /MD /Zi /Ox /Ob2 /DFORCE_INLINING /GL "
     cmd = cmd + " /Fd" + wobj[:-4] + ".pdb"
     building = getbuilding(opts)
     if (building): cmd = cmd + " /DBUILDING_" + building