aboutsummaryrefslogtreecommitdiff
path: root/dists/nsis
diff options
context:
space:
mode:
authorLittleboy2011-05-05 12:51:05 -0400
committerLittleboy2011-05-05 12:51:05 -0400
commitc160dbc8d2f29ba5070ec0e27fbb858bcf2a1218 (patch)
tree9ee7b59bf75e46c5b512e40115286d216fabffaf /dists/nsis
parentb2e67622b073d5b4b0b84e81fa5a9060f24ec60d (diff)
downloadscummvm-rg350-c160dbc8d2f29ba5070ec0e27fbb858bcf2a1218.tar.gz
scummvm-rg350-c160dbc8d2f29ba5070ec0e27fbb858bcf2a1218.tar.bz2
scummvm-rg350-c160dbc8d2f29ba5070ec0e27fbb858bcf2a1218.zip
DISTS: Add optional ARCH parameter to NSIS script
Diffstat (limited to 'dists/nsis')
-rw-r--r--dists/nsis/scummvm.nsi17
-rw-r--r--dists/nsis/scummvm.nsi.in17
2 files changed, 26 insertions, 8 deletions
diff --git a/dists/nsis/scummvm.nsi b/dists/nsis/scummvm.nsi
index 314f905f5e..03bd98ab66 100644
--- a/dists/nsis/scummvm.nsi
+++ b/dists/nsis/scummvm.nsi
@@ -26,11 +26,20 @@ Name ScummVM
!include MUI2.nsh
#########################################################################################
+# Command line options
+#########################################################################################
+
+#!define top_srcdir ""
+#!define build_dir ""
+#!define text_dir ""
+#!define ARCH "" ;(optional, defaults to win32)
+!ifndef ARCH
+!define ARCH "win32"
+!endif
+
+#########################################################################################
# Folders
#########################################################################################
-#!define top_srcdir "" ; passed through command line
-#!define build_dir "" ; passed through command line
-#!define text_dir "" ; passed through command line
!define engine_data "${top_srcdir}\dists\engine-data"
!define theme_data "${top_srcdir}\gui\themes"
@@ -47,7 +56,7 @@ Name ScummVM
#########################################################################################
# Installer configuration
#########################################################################################
-OutFile ${build_dir}\scummvm-${VERSION}-win32.exe
+OutFile ${build_dir}\scummvm-${VERSION}-${ARCH}.exe
InstallDir $PROGRAMFILES\ScummVM ; Default installation folder
InstallDirRegKey HKCU "Software\ScummVM\ScummVM" "InstallPath" ; Get installation folder from registry if available
; The application name needs to be refered directly instead of through ${REGKEY}
diff --git a/dists/nsis/scummvm.nsi.in b/dists/nsis/scummvm.nsi.in
index 4238e15f0c..457e82972b 100644
--- a/dists/nsis/scummvm.nsi.in
+++ b/dists/nsis/scummvm.nsi.in
@@ -26,11 +26,20 @@ Name ScummVM
!include MUI2.nsh
#########################################################################################
+# Command line options
+#########################################################################################
+
+#!define top_srcdir ""
+#!define build_dir ""
+#!define text_dir ""
+#!define ARCH "" ;(optional, defaults to win32)
+!ifndef ARCH
+!define ARCH "win32"
+!endif
+
+#########################################################################################
# Folders
#########################################################################################
-#!define top_srcdir "" ; passed through command line
-#!define build_dir "" ; passed through command line
-#!define text_dir "" ; passed through command line
!define engine_data "${top_srcdir}\dists\engine-data"
!define theme_data "${top_srcdir}\gui\themes"
@@ -47,7 +56,7 @@ Name ScummVM
#########################################################################################
# Installer configuration
#########################################################################################
-OutFile ${build_dir}\scummvm-${VERSION}-win32.exe
+OutFile ${build_dir}\scummvm-${VERSION}-${ARCH}.exe
InstallDir $PROGRAMFILES\ScummVM ; Default installation folder
InstallDirRegKey HKCU "Software\ScummVM\ScummVM" "InstallPath" ; Get installation folder from registry if available
; The application name needs to be refered directly instead of through ${REGKEY}