git.samba.org
/
obnox
/
wireshark
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab220c7
)
Looks like the Windows code isn't as clean as the Unix path:
author
jmayer
<jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 8 Aug 2011 14:03:53 +0000
(14:03 +0000)
committer
jmayer
<jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 8 Aug 2011 14:03:53 +0000
(14:03 +0000)
Comment out GTK_DISABLE_DEPRECATED
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38405
f5534014
-38df-0310-8fa8-
9805f1628bb7
config.nmake
patch
|
blob
|
history
diff --git
a/config.nmake
b/config.nmake
index 1bbb962af400a9c17c7fdf104e134b021da98e25..40b2327da80ea5c3bfaa10889fcb142c388a540a 100644
(file)
--- a/
config.nmake
+++ b/
config.nmake
@@
-1025,6
+1025,8
@@
GLIB_LIBS=$(GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \
GTHREAD_LIBS=$(GTK_DIR)\lib\gthread-$(GLIB_VERSION).lib
# GTK+
+# -DGTK_DISABLE_DEPRECATED \
+
GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \
/I$(GTK_DIR)\include\gdk-pixbuf-2.0 \
/I$(GTK_DIR)\lib\gtk-2.0\include \
@@
-1032,7
+1034,6
@@
GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.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 \