From ce2a8fadeb648856daf13e75d35ed3658edca89c Mon Sep 17 00:00:00 2001
From: Josh Yelon <jyelon@gmail.com>
Date: Thu, 20 Apr 2006 17:06:57 +0000
Subject: [PATCH] Fixes for icons

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

diff --git a/direct/src/directscripts/packpanda.nsi b/direct/src/directscripts/packpanda.nsi
index 7cdf57a8ff..82d8aa1b59 100755
--- a/direct/src/directscripts/packpanda.nsi
+++ b/direct/src/directscripts/packpanda.nsi
@@ -21,8 +21,10 @@
 ;   PSOURCE       - location of the panda source-tree if available, OR location of panda install tree.
 ;   PYEXTRAS      - directory containing python extras, if any.
 ;
-;   PPGAME    - directory containing prepagaged game, if any        (ie, "C:\My Games\Airblade")
+;   PPGAME      - directory containing prepagaged game, if any        (ie, "C:\My Games\Airblade")
 ;   PPMAIN      - python program containing prepackaged game, if any  (ie, "Airblade.py")
+;   PPICON      - file containing icon of prepackaged game.
+;
 
 !include "MUI.nsh"
 !include "WinMessages.nsh"
@@ -108,7 +110,7 @@ Section "${SMDIRECTORY}" SecCore
             File /r "${PANDA}\bin\ppython.exe"
             SetOutpath $INSTDIR\game
             File /r "${PPGAME}\*"
-            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Play ${NAME}.lnk" "$INSTDIR\bin\ppython.exe" "${PPMAIN}" "$INSTDIR\bin\ppython.exe" 0 SW_SHOWMINIMIZED "" "Play ${NAME}"
+            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Play ${NAME}.lnk" "$INSTDIR\bin\ppython.exe" "${PPMAIN}" "$INSTDIR\${PPICON}" 0 SW_SHOWMINIMIZED "" "Play ${NAME}"
 
         !else
 
diff --git a/direct/src/directscripts/packpanda.py b/direct/src/directscripts/packpanda.py
index 382ead75dd..6f0e98066e 100755
--- a/direct/src/directscripts/packpanda.py
+++ b/direct/src/directscripts/packpanda.py
@@ -141,6 +141,11 @@ if (os.path.isfile(LICENSE)==0):
 if (os.path.isfile(BITMAP)==0):
   BITMAP=os.path.join(NSIS,"Contrib","Graphics","Wizard","nsis.bmp")
 
+if (os.path.isfile(ICON)==0):
+  PPICON="bin\\ppython.exe"
+else:
+  PPICON="game\\icon.ico"
+
 ##############################################################################
 #
 # Copy the game to a temporary directory, so we can modify it safely.
@@ -247,6 +252,7 @@ CMD=CMD+'/DPANDA="'+PANDA+'" '
 CMD=CMD+'/DPSOURCE="'+PSOURCE+'" '
 CMD=CMD+'/DPPGAME="'+TMPDIR+'" '
 CMD=CMD+'/DPPMAIN="'+MAIN+'" '
+CMD=CMD+'/DPPICON="'+PPICON+'" '
 CMD=CMD+'"'+PSOURCE+'\\direct\\src\\directscripts\\packpanda.nsi"'
 
 print ""