osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Always build with GDK_DISABLE_DEPRECATED, GDK_PIXBUF_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED 

Also: remove "experimental" comment from Win32 GTK3 build config;

(I'm not able to try the WIN64 GTK3 build so I've left that marked as experimental).

svn path=/trunk/; revision=48145
This commit is contained in:
Bill Meier 2013-03-06 20:56:04 +00:00
parent 12d85ac2b3
commit af4a5770c2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.nmake
View File

@ -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)
@ -470,7 +470,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)
@ -673,7 +673,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 +1181,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 +1218,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 +1227,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 \