Glib docs recommend using the slice API if you know you won't need to realloc.

[metze/wireshark/wip.git] / config.nmake

diff --git a/config.nmake b/config.nmake
index b15f11593e6149fb96d53378729c88be1be9abc3..03ac461179cbc7ac79885724acdccd229f876477 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -250,7 +250,7 @@ GLIB_VERSION=2.0
 # If you want building with GTK+, set GTK_DIR to the pathname of the
 # directory in which the "include" and "lib" directories reside.
 #
-# Set the name to gtk3 if you want to use gtk3 - experimental
+# Set the name to gtk3 if you want to use gtk3
 GTK_NAME=gtk2
 GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
 
@@ -306,7 +306,8 @@ GTK_INST_VERSION=3.4
 #
 PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
 # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
-PCAP_VERSION=4_1_2
+PCAP_VERSION=4_1_3
+WPD_VERSION=4_1_2
 
 #
 # Optional: WinPcap remote capture support and new API
@@ -354,7 +355,7 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
 # If you don't have c-ares, comment this line out, so that C_ARES_DIR
 # isn't defined.
 #
-C_ARES_PKG=1.7.1
+C_ARES_PKG=1.9.1-1
 
 #
 # Optional: the GnuTLS library enables ssl decryption.
@@ -470,7 +471,7 @@ GLIB_VERSION=2.0
 # directory in which the "include" and "lib" directories reside.
 #
 #
-# Set the name to gtk3 if you want to use gtk3 - experimental
+# Set the name to gtk3 if you want to use gtk3 - (experimental ?)
 GTK_NAME=gtk2
 GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
 
@@ -526,7 +527,8 @@ GTK_INST_VERSION=3.4
 #
 PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
 # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
-PCAP_VERSION=4_1_2
+PCAP_VERSION=4_1_3
+WPD_VERSION=4_1_2
 
 #
 # Optional: WinPcap remote capture support and new API
@@ -574,7 +576,7 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
 # If you don't have c-ares, comment this line out, so that C_ARES_DIR
 # isn't defined.
 #
-C_ARES_PKG=1.7.1
+C_ARES_PKG=1.9.1-1
 
 #
 # Optional: the GnuTLS library enables ssl decryption.
@@ -673,7 +675,7 @@ GEOIP_PKG=1.4.8-2
 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win64ws
 
 !endif
-# win32 / win64
+##### win32 / win64 #####
 
 !IF "$(GTK_NAME)" == "gtk2"
 GTK_ETC_DIR=etc\gtk-2.0
@@ -1181,8 +1183,10 @@ GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \
        /I$(GTK_DIR)\include\atk-1.0 \
        /I$(GTK_DIR)\include\cairo \
        /I$(GTK_DIR)\include\pango-1.0 \
-       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_DISABLE_DEPRECATED \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
        -DGTK_DISABLE_DEPRECATED \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
        -DGSEAL_ENABLE
 GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
        $(GTK_DIR)\lib\gdk-win32-2.0.lib \
@@ -1216,9 +1220,6 @@ NEED_JPEG_DLL=USE
 NEED_TIFF_DLL=USE
 NEED_LZMA_DLL=USE
 
-#
-# Use of GTK3+ is experimental/not working
-#
 !ELSEIF "$(GTK_INST_VERSION)" == "3.4"
 
 # GTK+
@@ -1228,6 +1229,9 @@ GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-3.0 \
        /I$(GTK_DIR)\include\atk-1.0 \
        /I$(GTK_DIR)\include\cairo \
        /I$(GTK_DIR)\include\pango-1.0 \
+       -DGDK_DISABLE_DEPRECATED \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
+       -DGTK_DISABLE_DEPRECATED \
        -DGTK_DISABLE_SINGLE_INCLUDES \
        -DGSEAL_ENABLE
 GTK_LIBS=$(GTK_DIR)\lib\gtk-3.lib \