diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-14 20:53:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-14 21:20:01 +0300 |
| commit | ce46bdf12fcf69aff19fcef46229f17a0214570f (patch) | |
| tree | 6022f93206f61844bdcd57f8550ce0e15bd3385d | |
| parent | 5712e565763d3432293c73e5fe56958a1de48bb5 (diff) | |
| download | plus-ce46bdf12fcf69aff19fcef46229f17a0214570f.tar.gz plus-ce46bdf12fcf69aff19fcef46229f17a0214570f.tar.bz2 plus-ce46bdf12fcf69aff19fcef46229f17a0214570f.tar.xz plus-ce46bdf12fcf69aff19fcef46229f17a0214570f.zip | |
add BITS variable in windows installer build scripts.
| -rwxr-xr-x | build/packevol | 1 | ||||
| -rwxr-xr-x | build/packtmw | 1 | ||||
| -rwxr-xr-x | build/packwin | 1 | ||||
| -rw-r--r-- | packaging/windows/evol.nsi | 6 | ||||
| -rw-r--r-- | packaging/windows/setup.nsi | 6 | ||||
| -rw-r--r-- | packaging/windows/tmw.nsi | 6 |
6 files changed, 18 insertions, 3 deletions
diff --git a/build/packevol b/build/packevol index ec7290388..c46dc9417 100755 --- a/build/packevol +++ b/build/packevol @@ -10,5 +10,6 @@ makensis -DDLLDIR=$dir/../libs/dll/ \ -DPRODUCT_VERSION="1.7.3.4" \ -DEXESUFFIX=/src \ -DUPX=true \ + -DBITS=${BITS} \ evol.nsi diff --git a/build/packtmw b/build/packtmw index 396d88ffe..64e42afef 100755 --- a/build/packtmw +++ b/build/packtmw @@ -10,4 +10,5 @@ makensis -DDLLDIR=$dir/../libs/dll/ \ -DPRODUCT_VERSION="1.7.3.4" \ -DEXESUFFIX=/src \ -DUPX=true \ + -DBITS=${BITS} \ tmw.nsi diff --git a/build/packwin b/build/packwin index b461910b2..cbce115f8 100755 --- a/build/packwin +++ b/build/packwin @@ -10,5 +10,6 @@ makensis -DDLLDIR=$dir/../libs/dll/ \ -DPRODUCT_VERSION="1.7.3.4" \ -DEXESUFFIX=/src \ -DUPX=true \ + -DBITS=${BITS} \ setup.nsi 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 |