diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-11-19 20:27:08 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-11-19 20:27:08 +0000 |
| commit | 0740e4204168c2d86522699c5a16769a60e81f55 (patch) | |
| tree | 066c8a11f58d001c3f7abc7840b74518482932bf /packaging | |
| parent | f88856b344cbe0cb64f58d610ead1e5c7db9fa40 (diff) | |
Switch from individual GLib, GTK+, and related packages to the all-in-one
versions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31023 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 4 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 23 |
2 files changed, 11 insertions, 16 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index eacdb43afa..9db5094a4c 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -129,9 +129,7 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $( /DGTK_WIMP_DLLSRC_DIR=$(GTK_WIMP_DLLSRC_DIR) \ /DGTK_WIMP_RCDST_DIR=$(GTK_WIMP_RCDST_DIR) \ /DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \ - /DGLIB_DIR=$(GLIB_DIR) \ - /DGETTEXT_DIR=$(GETTEXT_DIR) \ - /DGETTEXT_DLL=$(GETTEXT_DLL) \ + /DINTL_DLL=$(INTL_DLL) \ /DVERSION=$(VERSION) \ /DWTAP_VERSION=$(WTAP_VERSION) \ !IF "$(C_ARES_DIR)" != "" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index d66ccce0a6..4e2169cd1d 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -359,15 +359,15 @@ File "..\..\wiretap\wiretap-${WTAP_VERSION}.dll" File "..\..\epan\libwireshark.dll" !endif File "..\..\wsutil\libwsutil.dll" -File "${GLIB_DIR}\bin\libgio-2.0-0.dll" -File "${GLIB_DIR}\bin\libglib-2.0-0.dll" -File "${GLIB_DIR}\bin\libgobject-2.0-0.dll" -File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll" -File "${GLIB_DIR}\bin\libgthread-2.0-0.dll" +File "${GTK_DIR}\bin\libgio-2.0-0.dll" +File "${GTK_DIR}\bin\libglib-2.0-0.dll" +File "${GTK_DIR}\bin\libgobject-2.0-0.dll" +File "${GTK_DIR}\bin\libgmodule-2.0-0.dll" +File "${GTK_DIR}\bin\libgthread-2.0-0.dll" !ifdef ICONV_DIR -File "${ICONV_DIR}\bin\iconv.dll" +File "${GTK_DIR}\bin\iconv.dll" !endif -File "${GETTEXT_DIR}\bin\${GETTEXT_DLL}" +File "${GTK_DIR}\bin\intl.dll" !ifdef ZLIB_DIR File "${ZLIB_DIR}\zlib1.dll" !endif @@ -828,13 +828,13 @@ 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}" +File "${GTK_DIR}\bin\${FREETYPE_DLL}" !endif !ifdef NEED_FONTCONFIG_DLL -File "${WIRESHARK_LIBS}\fontconfig\bin\${FONTCONFIG_DLL}" +File "${GTK_DIR}\bin\${FONTCONFIG_DLL}" !endif !ifdef NEED_EXPAT_DLL -File "${WIRESHARK_LIBS}\expat\bin\${EXPAT_DLL}" +File "${GTK_DIR}\bin\${EXPAT_DLL}" !endif SetOutPath $INSTDIR\etc\gtk-2.0 File "${GTK_DIR}\etc\gtk-2.0\*.*" @@ -850,9 +850,6 @@ SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\engines File "${GTK_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\engines\libpixmap.dll" SetOutPath $INSTDIR\lib\gtk-2.0\modules File "${GTK_DIR}\lib\gtk-2.0\modules\libgail.dll" -# Not needed with pango 1.14.5 -#SetOutPath $INSTDIR\lib\pango\${PANGO_LIB_DIR}\modules -#File "${GTK_DIR}\lib\pango\${PANGO_LIB_DIR}\modules\pango-*.dll" ; GTK MS-Windows Engine (GTK-Wimp) SetOutPath $INSTDIR\${GTK_WIMP_DLLDST_DIR} |