Make windows buildbots happy...

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

diff --git a/config.nmake b/config.nmake
index e83010d955b29423f49d14c7ec87fdeff48b092f..5dad38e7c13f7503687dec40210ed54ccf60de16 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -12,22 +12,25 @@ WIRESHARK_TARGET_PLATFORM=win32
 
 ##### Versions #####
 
-# The current Wireshark version
-# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
+# The SVN revision of our build. Updated by make-version.pl
+SVN_REVISION=0
+
+# The current Wireshark version. Recommended: Leave unchanged.
+# Updated by make-version.pl
 VERSION_MAJOR=1
 VERSION_MINOR=7
-VERSION_MICRO=0
-VERSION_BUILD=0
-# It's recommended to change VERSION_EXTRA for your own custom builds
-# e.g. "-SVN-12345"
-VERSION_EXTRA=
+VERSION_MICRO=1
+VERSION_BUILD=$(SVN_REVISION)
 
-# The version of the wiretap library (recommended: leave unchanged)
-WTAP_VERSION_MAJOR=1
-WTAP_VERSION_MINOR=7
-WTAP_VERSION_MICRO=0
+# Local build information. Recommended: Unique string for your
+# environment, e.g. "-JackStackBarbecue". Updated by make-version.pl
 
+VERSION_EXTRA=
 
+# The version of the wiretap library. Recommended: Leave unchanged.
+WTAP_VERSION_MAJOR=$(VERSION_MAJOR)
+WTAP_VERSION_MINOR=$(VERSION_MINOR)
+WTAP_VERSION_MICRO=0
 
 ##### Directories #####
 
@@ -160,7 +163,9 @@ NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe
 # Python version    CRT (32-bit)    CRT (64-bit)
 # 2.4.4             7.1             ?
 # 2.6.1             9.0             ?
-# 2.6.2                             9.0
+# 2.6.2             ?               9.0
+# 2.7.1             9.0             9.0
+# 3.2.2             9.0             9.0
 #
 # If you versions of Python and Visual C++ use different CRTs
 # comment this out.
@@ -216,9 +221,6 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1
 ### Warning Experimental - work in progress
 #WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1
 
-##### To use UIManager insted of GtkItemFactory comment out this line NOTE not completly implemented yet some menus will be missing####
-#MAIN_MENU_USE_UIMANAGER=^#define MAIN_MENU_USE_UIMANAGER 1
-
 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
 ##### Win32 Libraries #####
 #
@@ -1017,7 +1019,8 @@ RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO
 
 # GLib
 GLIB_CFLAGS=/I$(GTK_DIR)\include\glib-$(GLIB_VERSION) \
-       /I$(GTK_DIR)\lib\glib-$(GLIB_VERSION)\include
+       /I$(GTK_DIR)\lib\glib-$(GLIB_VERSION)\include \
+       -DG_DISABLE_DEPRECATED
 GLIB_LIBS=$(GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \
        $(GTK_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
        $(GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib
@@ -1030,6 +1033,8 @@ 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 \
+       -DGTK_DISABLE_DEPRECATED \
        -DGSEAL_ENABLE
 GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
        $(GTK_DIR)\lib\gdk-win32-2.0.lib \
@@ -1040,7 +1045,7 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
        $(GLIB_LIBS)
 
 # 2.18 was no good(Theming problem)
-!IF "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14"
+!IF "$(GTK_INST_VERSION)" == "2.24" || "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14"
 GTK_LIB_DIR=2.10.0
 
 !IFDEF PNG_DLL
@@ -1058,8 +1063,8 @@ 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_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines
+GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\$(GTK_LIB_DIR)\engines
 GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0
 GTK_WIMP_RCDST_DIR=etc\gtk-2.0
 !ELSE
@@ -1270,12 +1275,14 @@ SMI_CONFIG=
 
 !IFDEF GEOIP_DIR
 GEOIP_CONFIG=^#define HAVE_GEOIP 1
+GEOIP_V6_CONFIG=^#define HAVE_GEOIP_V6 1
 GEOIP_CFLAGS=/I$(GEOIP_DIR)
 GEOIP_LIBS=$(GEOIP_DIR)\GeoIP.lib
 !ELSE
-GeoIP_LIBS=
-GeoIP_CFLAGS=
-GeoIP_CONFIG=
+GEOIP_LIBS=
+GEOIP_CFLAGS=
+GEOIP_CONFIG=
+GEOIP_V6_CONFIG=
 !ENDIF
 
 !IFDEF ENABLE_LIBWIRESHARK