Finalizing 1.2.992

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:

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