diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2011-08-08 20:35:36 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2011-08-08 20:35:36 +0000 |
| commit | e22f19f645f992062aacb234f2daaeefe6e94028 (patch) | |
| tree | a13a38108b9607d3b1842c9422779cf21ded1b1f /config.nmake | |
| parent | 5d2ba021135d067ecaeba4613e7c111cfc15e76c (diff) | |
MAIN_MENU_USE_UIMANAGER is also used in some includes, not only
in .c files, so the aproach to #undef GTK_DISABLE_DEPRECATED was
wrong.
Only enable GTK_DISABLE_DEPRECATED if MAIN_MENU_USE_UIMANAGER is
defined.
svn path=/trunk/; revision=38420
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 40b2327da8..392c7c711c 100644 --- a/config.nmake +++ b/config.nmake @@ -1025,8 +1025,6 @@ 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 \ @@ -1035,6 +1033,9 @@ GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \ /I$(GTK_DIR)\include\pango-1.0 \ -DGTK_DISABLE_SINGLE_INCLUDES \ -DGSEAL_ENABLE +!IFDEF MAIN_MENU_USE_UIMANAGER +GTK_CFLAGS=$(GTK_CFLAGS) -DGTK_DISABLE_DEPRECATED +!ENDIF 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 \ |