diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-14 21:20:08 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-14 21:20:38 +0300 |
| commit | 6c84be6bfc43e839bfd76f146aabfff6d1fd025f (patch) | |
| tree | e3db078d544db5e7e258f034da146b249c06ab96 | |
| parent | ce46bdf12fcf69aff19fcef46229f17a0214570f (diff) | |
| download | manaplus-6c84be6bfc43e839bfd76f146aabfff6d1fd025f.tar.gz manaplus-6c84be6bfc43e839bfd76f146aabfff6d1fd025f.tar.bz2 manaplus-6c84be6bfc43e839bfd76f146aabfff6d1fd025f.tar.xz manaplus-6c84be6bfc43e839bfd76f146aabfff6d1fd025f.zip | |
Add SEHDLL 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 c46dc9417..f6f50ec0e 100755 --- a/build/packevol +++ b/build/packevol @@ -11,5 +11,6 @@ makensis -DDLLDIR=$dir/../libs/dll/ \ -DEXESUFFIX=/src \ -DUPX=true \ -DBITS=${BITS} \ + -DSEHDLL=${SEHDLL} \ evol.nsi diff --git a/build/packtmw b/build/packtmw index 64e42afef..665a09e40 100755 --- a/build/packtmw +++ b/build/packtmw @@ -11,4 +11,5 @@ makensis -DDLLDIR=$dir/../libs/dll/ \ -DEXESUFFIX=/src \ -DUPX=true \ -DBITS=${BITS} \ + -DSEHDLL=${SEHDLL} \ tmw.nsi diff --git a/build/packwin b/build/packwin index cbce115f8..264239334 100755 --- a/build/packwin +++ b/build/packwin @@ -11,5 +11,6 @@ makensis -DDLLDIR=$dir/../libs/dll/ \ -DEXESUFFIX=/src \ -DUPX=true \ -DBITS=${BITS} \ + -DSEHDLL=${SEHDLL} \ setup.nsi diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi index 506b51814..b8fbee2ec 100644 --- a/packaging/windows/evol.nsi +++ b/packaging/windows/evol.nsi @@ -41,6 +41,10 @@ RequestExecutionLevel admin !define BITS 32 !endif +!ifndef SEHDLL + !define SEHDLL "libgcc_s_sjlj-1.dll" +!endif + ;--- (and without !defines ) --- !System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe" @@ -266,7 +270,7 @@ Section "Core files (required)" SecCore File "${DLLDIR}\libSDL_gfx-15.dll" File "${DLLDIR}\libcurl-4.dll" File "${DLLDIR}\libfreetype-6.dll" - File "${DLLDIR}\libgcc_s_sjlj-1.dll" + File "${DLLDIR}\${SEHDLL}" File "${DLLDIR}\libiconv-2.dll" File "${DLLDIR}\libintl-8.dll" File "${DLLDIR}\libjpeg-9.dll" diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 32a4a5d26..56e671236 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -41,6 +41,10 @@ RequestExecutionLevel admin !define BITS 32 !endif +!ifndef SEHDLL + !define SEHDLL "libgcc_s_sjlj-1.dll" +!endif + ;--- (and without !defines ) --- !System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe" @@ -263,7 +267,7 @@ Section "Core files (required)" SecCore File "${DLLDIR}\libSDL_gfx-15.dll" File "${DLLDIR}\libcurl-4.dll" File "${DLLDIR}\libfreetype-6.dll" - File "${DLLDIR}\libgcc_s_sjlj-1.dll" + File "${DLLDIR}\${SEHDLL}" File "${DLLDIR}\libiconv-2.dll" File "${DLLDIR}\libintl-8.dll" File "${DLLDIR}\libjpeg-9.dll" diff --git a/packaging/windows/tmw.nsi b/packaging/windows/tmw.nsi index 536b98f62..4f5b24501 100644 --- a/packaging/windows/tmw.nsi +++ b/packaging/windows/tmw.nsi @@ -41,6 +41,10 @@ RequestExecutionLevel admin !define BITS 32 !endif +!ifndef SEHDLL + !define SEHDLL "libgcc_s_sjlj-1.dll" +!endif + ;--- (and without !defines ) --- !System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe" @@ -266,7 +270,7 @@ Section "Core files (required)" SecCore File "${DLLDIR}\libSDL_gfx-15.dll" File "${DLLDIR}\libcurl-4.dll" File "${DLLDIR}\libfreetype-6.dll" - File "${DLLDIR}\libgcc_s_sjlj-1.dll" + File "${DLLDIR}\${SEHDLL}" File "${DLLDIR}\libiconv-2.dll" File "${DLLDIR}\libintl-8.dll" File "${DLLDIR}\libjpeg-9.dll" |