Finalizing 1.2.992

This commit is contained in:
Josh Yelon 2006-09-19 02:40:23 +00:00
parent 72b1940cb8
commit ed482efbe7
2 changed files with 7 additions and 7 deletions

View File

@ -74,7 +74,7 @@ Function runFunction
ExecShell "open" "$SMPROGRAMS\${SMDIRECTORY}\Play ${NAME}.lnk" ExecShell "open" "$SMPROGRAMS\${SMDIRECTORY}\Play ${NAME}.lnk"
!else !else
ExecShell "open" "$SMPROGRAMS\${SMDIRECTORY}\Panda Greeting Card.lnk" ExecShell "open" "$SMPROGRAMS\${SMDIRECTORY}\Panda Greeting Card.lnk"
!endif !endif
FunctionEnd FunctionEnd
Section "${SMDIRECTORY}" SecCore Section "${SMDIRECTORY}" SecCore
@ -151,8 +151,8 @@ Section "${SMDIRECTORY}" SecCore
SetOutPath $INSTDIR\samples\GreetingCard 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" 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 SetOutPath $INSTDIR
CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Manual.lnk" "$INSTDIR\Manual.url" "" "$INSTDIR\python\ppython.exe" 0 "" "" "Panda Manual" 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\python\ppython.exe" 0 "" "" "Panda Website" CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Website.lnk" "$INSTDIR\Website.url" "" "$INSTDIR\bin\pzip.exe" 0 "" "" "Panda Website"
FindFirst $0 $1 $INSTDIR\samples\*--* FindFirst $0 $1 $INSTDIR\samples\*--*
loop: loop:

View File

@ -958,10 +958,10 @@ def CompileCxxMSVC7(wobj,fullsrc,ipath,opts):
if (opts.count("WITHINPANDA")): cmd = cmd + ' /DWITHIN_PANDA' if (opts.count("WITHINPANDA")): cmd = cmd + ' /DWITHIN_PANDA'
if (opts.count("MSFORSCOPE")==0): cmd = cmd + ' /Zc:forScope' if (opts.count("MSFORSCOPE")==0): cmd = cmd + ' /Zc:forScope'
optlevel = getoptlevel(opts,OPTIMIZE) optlevel = getoptlevel(opts,OPTIMIZE)
if (optlevel==1): cmd = cmd + " /MD /Zi /DNDEBUG /RTCs /GS" if (optlevel==1): cmd = cmd + " /MD /Zi /RTCs /GS"
if (optlevel==2): cmd = cmd + " /MD /Zi /DNDEBUG " if (optlevel==2): cmd = cmd + " /MD /Zi "
if (optlevel==3): cmd = cmd + " /MD /Zi /DNDEBUG /O2 /Ob2 /DFORCE_INLINING " if (optlevel==3): cmd = cmd + " /MD /Zi /O2 /Ob2 /DFORCE_INLINING "
if (optlevel==4): cmd = cmd + " /MD /Zi /DNDEBUG /Ox /Ob2 /DFORCE_INLINING /GL " if (optlevel==4): cmd = cmd + " /MD /Zi /Ox /Ob2 /DFORCE_INLINING /GL "
cmd = cmd + " /Fd" + wobj[:-4] + ".pdb" cmd = cmd + " /Fd" + wobj[:-4] + ".pdb"
building = getbuilding(opts) building = getbuilding(opts)
if (building): cmd = cmd + " /DBUILDING_" + building if (building): cmd = cmd + " /DBUILDING_" + building