diff options
author | Anders Broman <anders.broman@ericsson.com> | 2009-09-16 13:34:37 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2009-09-16 13:34:37 +0000 |
commit | ef2d9da167024f38e69a2196f565037c74469c74 (patch) | |
tree | 4c0ad7e583b8535cc3bf610a7dce77065332e905 /packaging/nsis/Makefile.nmake | |
parent | 5a2247f5a305782dbdaf1f60f967fae603b8ae56 (diff) |
Use the latest GTK packages.
svn path=/trunk/; revision=29943
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
-rw-r--r-- | packaging/nsis/Makefile.nmake | 13 |
1 files changed, 13 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 |