diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-05-16 09:21:57 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-05-16 16:25:38 +0000 |
| commit | 0a249087c311feacf693144372ec038938c47415 (patch) | |
| tree | 9f6c0446b522ccaef374b1f2cc63ecb3b8f67b74 /packaging | |
| parent | 33750ab4b4df833b35a9f141a5089e22c4aa534e (diff) | |
Build with GTK+ 2.24.23.
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460
Reviewed-on: https://code.wireshark.org/review/1665
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 12 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 9 |
2 files changed, 21 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index ae9a144fc3..1c32f06f06 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -144,6 +144,10 @@ NSIS_FLAGS=\ /DNEED_FREETYPE_DLL=$(NEED_FREETYPE_DLL) \ /DFREETYPE_DLL=$(FREETYPE_DLL) \ !ENDIF +!IFDEF NEED_HARFBUZZ_DLL + /DNEED_HARFBUZZ_DLL=$(NEED_HARFBUZZ_DLL) \ + /DHARFBUZZ_DLL=$(HARFBUZZ_DLL) \ +!ENDIF !IFDEF NEED_JASPER_DLL /DNEED_JASPER_DLL=$(NEED_JASPER_DLL) \ /DJASPER_DLL=$(JASPER_DLL) \ @@ -164,6 +168,14 @@ NSIS_FLAGS=\ /DNEED_PNG_DLL=$(NEED_PNG_DLL) \ /DPNG_DLL=$(PNG_DLL) \ !ENDIF +!IFDEF NEED_SEH_DLL + /DNEED_SEH_DLL=$(NEED_SEH_DLL) \ + /DSEH_DLL=$(SEH_DLL) \ +!ENDIF +!IFDEF NEED_SJLJ_DLL + /DNEED_SJLJ_DLL=$(NEED_SJLJ_DLL) \ + /DSJLJ_DLL=$(SJLJ_DLL) \ +!ENDIF !IFDEF NEED_TIFF_DLL /DNEED_TIFF_DLL=$(NEED_TIFF_DLL) \ /DTIFF_DLL=$(TIFF_DLL) \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 5cd71ee446..6fe00bd0a6 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -803,6 +803,9 @@ File "${STAGING_DIR}\${FONTCONFIG_DLL}" File "${STAGING_DIR}\libpangoft2-1.0-0.dll" File "${STAGING_DIR}\${FREETYPE_DLL}" !endif +!ifdef NEED_HARFBUZZ_DLL +File "${STAGING_DIR}\${HARFBUZZ_DLL}" +!endif !ifdef NEED_JASPER_DLL File "${STAGING_DIR}\${JASPER_DLL}" !endif @@ -818,6 +821,12 @@ File "${STAGING_DIR}\${PIXMAN_DLL}" !ifdef NEED_PNG_DLL File "${STAGING_DIR}\${PNG_DLL}" !endif +!ifdef NEED_SEH_DLL +File "${STAGING_DIR}\${SEH_DLL}" +!endif +!ifdef NEED_SJLJ_DLL +File "${STAGING_DIR}\${SJLJ_DLL}" +!endif !ifdef NEED_TIFF_DLL File "${STAGING_DIR}\${TIFF_DLL}" !endif |