diff options
| -rw-r--r-- | Makefile.nmake | 82 | ||||
| -rw-r--r-- | config.nmake | 95 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 4 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 23 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
6 files changed, 46 insertions, 162 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 058f93ca42..747848b400 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -735,20 +735,9 @@ setup: verify_tools clean_setup process_libs # (The choice is determined by the value of the macro WIN_SETUP_OPT). process_libs: @if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS) -!IF "$(GTK_INST_VERSION)" == "2.18" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12" - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk$(GTK_INST_VERSION)/glib_$(GLIB_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk$(GTK_INST_VERSION)/glib-dev_$(GLIB_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip -!ELSE -!ERROR ? Unknown or invalid GTK_INST_VERSION -!ENDIF -!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32" - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gettext-runtime-0.17-1 gettext-runtime-0.17-1.zip -!ELSE +!IFDEF GTK_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gettext-0.17-1 gettext$(GETTEXT_PKG).zip + gtk2 gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip !ENDIF !IFDEF KFW_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -801,48 +790,6 @@ process_libs: @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ . GeoIP-1.4.5ws.zip !ENDIF - -!IFDEF GTK_DIR -!IF "$(GTK_INST_VERSION)" == "2.18" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12" - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/gtk+_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/gtk+-dev_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/cairo_$(CAIRO_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/cairo-dev_$(CAIRO_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/atk_$(ATK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/atk-dev_$(ATK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/libpng_$(LIBPNG_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/$(TIFF_PKG).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/$(JPEG_PKG).zip -!ELSE -!ERROR ? Unknown or invalid GTK_INST_VERSION -!ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.26" || "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/pango_$(PANGO_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk$(GTK_INST_VERSION)/pango-dev_$(PANGO_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip -!ELSE -!ERROR ? Unknown or invalid PANGO_INST_VERSION -!ENDIF -!ENDIF -# PANGO >=1.24.5 needs these DLL:s -!IFDEF NEED_FREETYPE_DLL - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - expat gtk$(GTK_INST_VERSION)/expat_$(EXPAT_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - fontconfig gtk$(GTK_INST_VERSION)/fontconfig_$(FONTCONFIG_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - freetype gtk$(GTK_INST_VERSION)/freetype_$(FREETYPE_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip -!ENDIF !IFDEF HHC_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ user-guide user-guide-28526.zip @@ -1014,20 +961,13 @@ install-all: install-generated-files if not exist $(INSTALL_DIR)\lib\gtk-2.0\modules mkdir $(INSTALL_DIR)\lib\gtk-2.0\modules if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR) mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR) if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders -# if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines -# if not exist $(INSTALL_DIR)\lib\pango mkdir $(INSTALL_DIR)\lib\pango -# if not exist $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR) -# if not exist $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules xcopy $(GTK_DIR)\etc\gtk-2.0\*.* $(INSTALL_DIR)\etc\gtk-2.0 /d if exist $(GTK_DIR)\etc\pango xcopy $(GTK_DIR)\etc\pango\pango.* $(INSTALL_DIR)\etc\pango /d if exist $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d xcopy $(GTK_DIR)\lib\gtk-2.0\modules\libgail.dll $(INSTALL_DIR)\lib\gtk-2.0\modules /d xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines\libpixmap.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines /d -# xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\im-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules /d -# xcopy $(GTK_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d !IFDEF NEED_LIBPNG_DLL -# xcopy $(GTK_DIR)\bin\libpng13.dll $(INSTALL_DIR) /d xcopy $(GTK_DIR)\bin\libpng12-0.dll $(INSTALL_DIR) /d !ENDIF !IFDEF NEED_LIBTIFF_DLL @@ -1042,24 +982,24 @@ install-all: install-generated-files !ENDIF !IFDEF NEED_FREETYPE_DLL xcopy $(GTK_DIR)\bin\libpangoft2-1.0-0.dll $(INSTALL_DIR) /d - xcopy $(WIRESHARK_LIBS)\freetype\bin\$(FREETYPE_DLL) $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\$(FREETYPE_DLL) $(INSTALL_DIR) /d !ENDIF !IFDEF NEED_FONTCONFIG_DLL - xcopy $(WIRESHARK_LIBS)\fontconfig\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d !ENDIF !IFDEF NEED_EXPAT_DLL - xcopy $(WIRESHARK_LIBS)\expat\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d !ENDIF if not exist $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) /d if not exist $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR) xcopy "$(GTK_WIMP_RCSRC_DIR)\gtkrc" $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR) /d - xcopy $(GLIB_DIR)\bin\libgio-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GLIB_DIR)\bin\libgthread-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GETTEXT_DIR)\bin\$(GETTEXT_DLL) $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libgio-2.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\libgthread-2.0-0.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\$(INTL_DLL) $(INSTALL_DIR) /d !IFDEF ZLIB_DIR xcopy $(ZLIB_DLL) $(INSTALL_DIR) /d !ENDIF diff --git a/config.nmake b/config.nmake index 06bfe923e6..a7321664fb 100644 --- a/config.nmake +++ b/config.nmake @@ -137,16 +137,13 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe # Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x # GLIB_VERSION=2.0 -GLIB_DIR=$(WIRESHARK_LIBS)\glib -# This macro is used by the setup target. -GLIB_PKG=2.22.2-1 ##### To Use new packet list uncomment this line #### ### Warning Experimental - work in progress NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1 # -# Mandatory: GTK (& related libs) settings +# Mandatory: GLib, GTK & related library settings # # Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x # @@ -160,17 +157,9 @@ JPEG_DLL=libjpeg-7.dll FREETYPE_DLL=freetype6.dll FONTCONFIG_DLL=libfontconfig-1.dll EXPAT_DLL=libexpat-1.dll -# These macros are used by the setup target. -GTK_PKG=2.16.6-1 -CAIRO_PKG=1.8.8-2 -ATK_PKG=1.26.0-1 -LIBPNG_PKG=1.2.39-1 -TIFF_PKG=libtiff_3.9.1-1_win32 -JPEG_PKG=jpeg_7-1_win32 -PANGO_PKG=1.26.0-1 -FREETYPE_PKG=2.3.9-1 -FONTCONFIG_PKG=2.7.3-1 -EXPAT_PKG=2.0.1-1 +INTL_DLL=intl.dll +# This macro is used by the setup target. +GTK_PKG=2.16.6-20091013 # # Mandatory: Version numbers of GTK and pango. @@ -180,19 +169,6 @@ EXPAT_PKG=2.0.1-1 # # GTK 2.12 is the mainline since Wireshark 0.99.7 GTK_INST_VERSION=2.16 -PANGO_INST_VERSION=1.26 - -# -# Mandatory for GTK >= 2: Gettext -# -# Set GETTEXT_DIR to the directory in which the -# GETTEXT include files and library resides. -# -GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1 -# This macro is used by the nsis installer script and by the install target. -GETTEXT_DLL=intl.dll -# This macro is used by the setup target. -GETTEXT_PKG=-runtime-0.17-1 # # Optional: WinPcap developer's pack to capture network traffic. @@ -370,16 +346,13 @@ GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.5ws # Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x # GLIB_VERSION=2.0 -GLIB_DIR=$(WIRESHARK_LIBS)\glib -# This macro is used by the setup target. -GLIB_PKG=2.20.5-1 ##### To Use new packet list uncomment this line #### ### Warning Experimental - work in progress NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1 # -# Mandatory: GTK (& related libs) settings +# Mandatory: GLib, GTK & related library settings # # Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x # @@ -393,17 +366,10 @@ JPEG_DLL=libjpeg-7.dll FREETYPE_DLL=libfreetype-6.dll FONTCONFIG_DLL=libfontconfig-1.dll EXPAT_DLL=libexpat-1.dll +INTL_DLL=libintl-8.dll + # These macros are used by the setup target. -GTK_PKG=2.16.6-1 -CAIRO_PKG=1.8.8-2 -ATK_PKG=1.26.0-2 -LIBPNG_PKG=1.2.40-1 -TIFF_PKG=libtiff_3.9.1-1_win64 -JPEG_PKG=jpeg_7-1_win64 -PANGO_PKG=1.24.5-2 -FREETYPE_PKG=2.3.9-2 -FONTCONFIG_PKG=2.7.3-1 -EXPAT_PKG=2.0.1-2 +GTK_PKG=2.16.6-20090912 # # Mandatory: Version numbers of GTK and pango. @@ -412,19 +378,6 @@ EXPAT_PKG=2.0.1-2 # These macros are used by the nsis installer script and by the setup target. # GTK_INST_VERSION=2.16 -PANGO_INST_VERSION=1.24 - -# -# Mandatory for GTK >= 2: Gettext -# -# Set GETTEXT_DIR to the directory in which the -# GETTEXT include files and library resides. -# -GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.17-1 -# This macro is used by the nsis installer script and by the install target. -GETTEXT_DLL=libintl-8.dll -# This macro is used by the setup target. -GETTEXT_PKG=_0.17-1_win64 # # Optional: WinPcap developer's pack to capture network traffic. @@ -934,12 +887,12 @@ WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO) RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO) # GLib -GLIB_CFLAGS=/I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \ - /I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include -GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \ - $(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \ - $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib -GTHREAD_LIBS=$(GLIB_DIR)\lib\gthread-$(GLIB_VERSION).lib \ +GLIB_CFLAGS=/I$(GTK_DIR)\include\glib-$(GLIB_VERSION) \ + /I$(GTK_DIR)\lib\glib-$(GLIB_VERSION)\include +GLIB_LIBS=$(GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \ + $(GTK_DIR)\lib\gmodule-$(GLIB_VERSION).lib \ + $(GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib +GTHREAD_LIBS=$(GTK_DIR)\lib\gthread-$(GLIB_VERSION).lib # GTK+ GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \ @@ -953,12 +906,19 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \ $(GTK_DIR)\lib\pango-1.0.lib \ $(GLIB_LIBS) + !IF "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12" GTK_LIB_DIR=2.10.0 + NEED_LIBPNG_DLL=USE NEED_LIBJPEG_DLL=USE NEED_LIBTIFF_DLL=USE NEED_CAIRO_DLL=USE +# Pango >=1.24.5 Needs these: +NEED_FREETYPE_DLL=USE +NEED_FONTCONFIG_DLL=USE +NEED_EXPAT_DLL=USE + GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\2.10.0\engines GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0 @@ -967,18 +927,7 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0 !ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.26" || "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" || "$(PANGO_INST_VERSION)" == "1.18" || "$(PANGO_INST_VERSION)" == "1.16" -PANGO_LIB_DIR=1.5.0 -!ELSE -!ERROR ? Unknown or invalid PANGO_INST_VERSION -!ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.26" || "$(PANGO_INST_VERSION)" == "1.24" -#PANGO >=1.24.5 Needs these: -NEED_FREETYPE_DLL=USE -NEED_FONTCONFIG_DLL=USE -NEED_EXPAT_DLL=USE -!ENDIF !IFDEF AIRPCAP_DIR AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1 AIRPDCAP_CONFIG=^#define HAVE_AIRPDCAP 1 @@ -1182,7 +1131,7 @@ LIBWIRESHARK_CONFIG= !ENDIF # Construct the path -PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH) +PATH=$(PATH);$(CYGWIN_PATH);$(GTK_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH) # We can't use a lot of IPv6 code with plain Visual C++ 6.0 !IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK) 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} diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 3e34eb15d7..5e18d43074 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -4,7 +4,7 @@ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2009-11-12" +export DOWNLOAD_TAG="2009-11-19" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 | sed -e s/win32/win/` diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh index 45db6e968f..151f828310 100755 --- a/tools/win64-setup.sh +++ b/tools/win64-setup.sh @@ -4,7 +4,7 @@ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2009-11-12" +export DOWNLOAD_TAG="2009-11-19" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |