summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-14 21:20:08 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-14 21:20:38 +0300
commit6c84be6bfc43e839bfd76f146aabfff6d1fd025f (patch)
treee3db078d544db5e7e258f034da146b249c06ab96 /packaging
parentce46bdf12fcf69aff19fcef46229f17a0214570f (diff)
downloadmv-6c84be6bfc43e839bfd76f146aabfff6d1fd025f.tar.gz
mv-6c84be6bfc43e839bfd76f146aabfff6d1fd025f.tar.bz2
mv-6c84be6bfc43e839bfd76f146aabfff6d1fd025f.tar.xz
mv-6c84be6bfc43e839bfd76f146aabfff6d1fd025f.zip
Add SEHDLL variable in windows installer build scripts.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/windows/evol.nsi6
-rw-r--r--packaging/windows/setup.nsi6
-rw-r--r--packaging/windows/tmw.nsi6
3 files changed, 15 insertions, 3 deletions
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"