From c160dbc8d2f29ba5070ec0e27fbb858bcf2a1218 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Thu, 5 May 2011 12:51:05 -0400 Subject: DISTS: Add optional ARCH parameter to NSIS script --- dists/nsis/scummvm.nsi | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'dists/nsis/scummvm.nsi') 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 @@ -25,12 +25,21 @@ Name ScummVM # Included files !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} -- cgit v1.2.3