Trivial formatting differences (removed tabs, added newline between functions).

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

diff --git a/config.nmake b/config.nmake
index 319410c530e22cea54087d066bba4de758f265b6..df06043f46a90200378810590716834200dd8a05 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -217,7 +217,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1
 #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
+MAIN_MENU_USE_UIMANAGER=^#define MAIN_MENU_USE_UIMANAGER 1
 
 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
 ##### Win32 Libraries #####
@@ -1017,7 +1017,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,12 +1031,15 @@ 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 \
        $(GTK_DIR)\lib\gdk_pixbuf-2.0.lib \
        $(GTK_DIR)\lib\cairo.lib \
        $(GTK_DIR)\lib\pango-1.0.lib \
+       $(GTK_DIR)\lib\pangocairo-1.0.lib \
        $(GLIB_LIBS)
 
 # 2.18 was no good(Theming problem)