minor build system changes

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

diff --git a/make-win32-installer.sh.in b/make-win32-installer.sh.in
index f88dd5ea51423072ef8ea9713f982832bad1b4cd..2f251c2b81036076dc9a8cf3d40c79f1ad9d8a9c 100644 (file)
--- a/make-win32-installer.sh.in
+++ b/make-win32-installer.sh.in
@@ -17,10 +17,11 @@ ROOT_DIR="$PWD"
 COMPRESSION="/solid lzma"
 DEST="tmp-yoink-win32"
 SCRIPT="$DEST/yoink.nsi"
+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"
@@ -75,7 +76,7 @@ VIAddVersionKey               "ProductVersion"        "@VERSION@"
 VIAddVersionKey                "LegalCopyright"        "Copyright 2009 Charles McGarvey et al."
 
 ;General
-OutFile                                        "$ROOT_DIR/yoinksetup-@VERSION@.exe"
+OutFile                                        "$ROOT_DIR/$OUT_FILE"
 SetCompressor                  $COMPRESSION
 ShowInstDetails                        show
 ShowUninstDetails              show
@@ -87,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/setup.ico"
+!define MUI_UNICON                                             "$ROOT_DIR/src/uninstall.ico"
 ; Language
 !define MUI_LANGDLL_ALWAYSSHOW
 !define MUI_LANGDLL_REGISTRY_ROOT              "HKCU"
@@ -262,6 +263,9 @@ Section "$SEC_INSTALL" SecInstallYoink
   File "$ROOT_DIR/src/yoink.exe"
   ; data
   File /r /x Makefile* /x *.desktop "$ROOT_DIR/data"
+  ; documentation
+  File "$ROOT_DIR/AUTHORS" "$ROOT_DIR/ChangeLog" "$ROOT_DIR/COPYING"
+  File "$ROOT_DIR/README" "$ROOT_DIR/TODO"
   ; uninstall
   WriteUninstaller "uninstall.exe"
 EOF
@@ -323,15 +327,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
@@ -345,6 +340,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