diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-09-25 16:09:58 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-09-25 16:09:58 +0000 |
| commit | 6b4a7ba74dbdddae0a55ec2d2c563711dc8abdb5 (patch) | |
| tree | 820385d1779e4b1f16037a1f8dc9f6504c7ece6a /packaging | |
| parent | 81108a948b36381986ccd953a49e1e4c97fe2d15 (diff) | |
Use GTK+ 2.12
svn path=/trunk/; revision=22955
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 6 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 84bfc565d0..ab3f174b76 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -131,6 +131,12 @@ $(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nm !IFDEF NEED_LIBPNG_DLL /DNEED_LIBPNG_DLL=$(NEED_LIBPNG_DLL) \ !ENDIF +!IFDEF NEED_LIBJPEG_DLL + /DNEED_LIBJPEG_DLL=$(NEED_LIBJPEG_DLL) \ +!ENDIF +!IFDEF NEED_LIBTIFF_DLL + /DNEED_LIBTIFF_DLL=$(NEED_LIBTIFF_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 9e2082d011..de94141f50 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -691,12 +691,18 @@ File "${GTK2_DIR}\bin\libpangocairo-1.0-0.dll" !ifdef NEED_LIBPNG_DLL File "${GTK2_DIR}\bin\libpng13.dll" !endif +!ifdef NEED_LIBTIFF_DLL +File "${GTK2_DIR}\bin\libtiff3.dll" +!endif +!ifdef NEED_LIBJPEG_DLL +File "${GTK2_DIR}\bin\jpeg62.dll" +!endif SetOutPath $INSTDIR\etc\gtk-2.0 File "${GTK2_DIR}\etc\gtk-2.0\*.*" SetOutPath $INSTDIR\etc\pango File "${GTK2_DIR}\etc\pango\pango.*" -SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders -File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders\libpixbufloader-*.dll" +#SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders +#File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders\libpixbufloader-*.dll" SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules\im-*.dll" # Not needed with pango 1.14.5 |