diff options
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 13 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 10 |
2 files changed, 23 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 5fb9ee1377..c84cb3bc1e 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -84,6 +84,7 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $( $(MAKENSIS) \ /DWIRESHARK_TARGET_PLATFORM=$(WIRESHARK_TARGET_PLATFORM) \ /DMSVC_VARIANT=$(MSVC_VARIANT) \ + /DWIRESHARK_LIBS=$(WIRESHARK_LIBS) \ !IFDEF MSVCR_DLL /DMSVCR_DLL="$(MSVCR_DLL)" \ !ENDIF @@ -108,6 +109,18 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $( /DNEED_LIBTIFF_DLL=$(NEED_LIBTIFF_DLL) \ /DTIFF_DLL=$(TIFF_DLL) \ !ENDIF +!IFDEF NEED_FREETYPE_DLL + /DNEED_FREETYPE_DLL=$(NEED_FREETYPE_DLL) \ + /DFREETYPE_DLL=$(FREETYPE_DLL) \ +!ENDIF +!IFDEF NEED_FONTCONFIG_DLL + /DNEED_FONTCONFIG_DLL=$(NEED_FONTCONFIG_DLL) \ + /DFONTCONFIG_DLL=$(FONTCONFIG_DLL) \ +!ENDIF +!IFDEF NEED_EXPAT_DLL + /DNEED_EXPAT_DLL=$(NEED_EXPAT_DLL) \ + /DEXPAT_DLL=$(EXPAT_DLL) \ +!ENDIF !IFDEF NEED_CAIRO_DLL /DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \ !ENDIF diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index dc6a442387..8f2770ca59 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -834,6 +834,16 @@ File "${GTK_DIR}\bin\${TIFF_DLL}" !ifdef NEED_LIBJPEG_DLL File "${GTK_DIR}\bin\${JPEG_DLL}" !endif +!ifdef NEED_FREETYPE_DLL +File "${GTK_DIR}\bin\libpangoft2-1.0-0.dll" +File "${WIRESHARK_LIBS}\freetype\bin\${FREETYPE_DLL}" +!endif +!ifdef NEED_FONTCONFIG_DLL +File "${WIRESHARK_LIBS}\fontconfig\bin\${FONTCONFIG_DLL}" +!endif +!ifdef NEED_EXPAT_DLL +File "${WIRESHARK_LIBS}\expat\bin\${EXPAT_DLL}" +!endif SetOutPath $INSTDIR\etc\gtk-2.0 File "${GTK_DIR}\etc\gtk-2.0\*.*" |