starting to move to a generic state structure

[chaz/yoink] / make-win32-installer.sh.in

diff --git a/make-win32-installer.sh.in b/make-win32-installer.sh.in
index b5c4d9a13e676476f2652400eed53b4dd0f5d68a..4bfc6b3f9fab339d2b9ba64cd591f0184b2b30c1 100644 (file)
--- a/make-win32-installer.sh.in
+++ b/make-win32-installer.sh.in
@@ -21,7 +21,7 @@ OUT_FILE=${1:-yoinksetup-@VERSION@.exe}
 
 # DLL dependencies
 DLLS="SDL SDL_image zlib1 libpng12-0 OpenAL32 libalut-0 libvorbis-0 libogg-0"
-DLLS="$DLLS libvorbisfile-3"
+DLLS="$DLLS libvorbisfile-3 lua51"
 
 # Prepare
 ${STRIP:-strip} "$ROOT_DIR/src/yoink.exe"
@@ -88,8 +88,8 @@ RequestExecutionLevel highest
 ;; Modern UI Configuration ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-!define MUI_ICON                                               "$ROOT_DIR/src/yoink.ico"
-!define MUI_UNICON                                             "$ROOT_DIR/src/yoink.ico"
+!define MUI_ICON                                               "$ROOT_DIR/src/yoink_setup.ico"
+!define MUI_UNICON                                             "$ROOT_DIR/src/yoink_uninstall.ico"
 ; Language
 !define MUI_LANGDLL_ALWAYSSHOW
 !define MUI_LANGDLL_REGISTRY_ROOT              "HKCU"
@@ -324,15 +324,6 @@ SetOverwrite on
 CreateShortCut "\$DESKTOP\\Yoink.lnk" "\$INSTDIR\\yoink.exe" \
        "" "\$INSTDIR\\yoink.exe" 0
 SetOverwrite off
-SectionEnd
-
-       ; Yoink shortcut in start menu
-Section "$SEC_SHORTCUT2" SecStartMenuShortcut
-SetOverwrite on
-!insertmacro CreateDirectoryOnce "\$SMPROGRAMS\\Yoink"
-CreateShortCut "\$SMPROGRAMS\\Yoink\\Play Yoink!.lnk" \
-       "\$INSTDIR\\yoink.exe" "" "\$INSTDIR\\yoink.exe" 0
-SetOverwrite off
 SectionEnd
 
        ; Yoink uninstall shortcut in start menu
@@ -346,6 +337,15 @@ SetOverwrite on
 CreateShortCut  "\$SMPROGRAMS\\Yoink\\Uninstall.lnk" \
        "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
 SetOverwrite off
+SectionEnd
+
+       ; Yoink shortcut in start menu
+Section "$SEC_SHORTCUT2" SecStartMenuShortcut
+SetOverwrite on
+!insertmacro CreateDirectoryOnce "\$SMPROGRAMS\\Yoink"
+CreateShortCut "\$SMPROGRAMS\\Yoink\\Play Yoink!.lnk" \
+       "\$INSTDIR\\yoink.exe" "" "\$INSTDIR\\yoink.exe" 0
+SetOverwrite off
 SectionEnd
 
 SectionGroupEnd