From ce46bdf12fcf69aff19fcef46229f17a0214570f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 14 Mar 2017 20:53:55 +0300
Subject: add BITS variable in windows installer build scripts.

---
 packaging/windows/evol.nsi  | 6 +++++-
 packaging/windows/setup.nsi | 6 +++++-
 packaging/windows/tmw.nsi   | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'packaging')

diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
index ea1c64e72..506b51814 100644
--- a/packaging/windows/evol.nsi
+++ b/packaging/windows/evol.nsi
@@ -37,6 +37,10 @@ RequestExecutionLevel admin
   !define DLLDIR ${SRCDIR}/dll
 !endif
 
+!ifndef BITS
+  !define BITS 32
+!endif
+
 ;--- (and without !defines ) ---
 !System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
 
@@ -170,7 +174,7 @@ ReserveFile "setup_finish.bmp"
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "evol-${PRODUCT_VERSION}-win32.exe"
+OutFile "evol-${PRODUCT_VERSION}-win${BITS}.exe"
 InstallDir "$PROGRAMFILES\EvolOnline"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index e4b6bbf10..32a4a5d26 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -37,6 +37,10 @@ RequestExecutionLevel admin
   !define DLLDIR ${SRCDIR}/dll
 !endif
 
+!ifndef BITS
+  !define BITS 32
+!endif
+
 ;--- (and without !defines ) ---
 !System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
 
@@ -170,7 +174,7 @@ ReserveFile "setup_finish.bmp"
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "manaplus-${PRODUCT_VERSION}-win32.exe"
+OutFile "manaplus-${PRODUCT_VERSION}-win${BITS}.exe"
 InstallDir "$PROGRAMFILES\Mana"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
diff --git a/packaging/windows/tmw.nsi b/packaging/windows/tmw.nsi
index 472255a91..536b98f62 100644
--- a/packaging/windows/tmw.nsi
+++ b/packaging/windows/tmw.nsi
@@ -37,6 +37,10 @@ RequestExecutionLevel admin
   !define DLLDIR ${SRCDIR}/dll
 !endif
 
+!ifndef BITS
+  !define BITS 32
+!endif
+
 ;--- (and without !defines ) ---
 !System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
 
@@ -170,7 +174,7 @@ ReserveFile "setup_finish.bmp"
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "tmw-${PRODUCT_VERSION}-win32.exe"
+OutFile "tmw-${PRODUCT_VERSION}-win${BITS}.exe"
 InstallDir "$PROGRAMFILES\The Mana World"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
-- 
cgit v1.2.3-70-g09d2