X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=CMakeLists.txt;h=b2b766ea6ca8a636519f766e71669d4d64fccfde;hb=d1697aa2ba29d95649e6fd9fcf5e30a71f4dda83;hp=9af79ce939b166be728dac4e37d5b5698db99ce8;hpb=973f6d2137044e056cb72b30cfe5b80ba6de312f;p=xonotic%2Fnetradiant.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9af79ce9..b2b766ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,8 @@ if (NOT WIN32)
 endif ()
 
 set(CMAKE_POSITION_INDEPENDENT_CODE 1)
-set(GTK_NS "GTK2" CACHE STRING "GTK variable prefix")
+set(GTK_TARGET 2 CACHE STRING "GTK target")
+add_definitions(-DGTK_TARGET=${GTK_TARGET})
 
 #-----------------------------------------------------------------------
 # Defs
@@ -89,6 +90,20 @@ if (NOT CMAKE_BUILD_TYPE MATCHES Release)
     add_definitions(-D_DEBUG=1)
 endif ()
 
+macro(disable_deprecated name gtk2only)
+    add_definitions(-D${name}_DISABLE_SINGLE_INCLUDES)
+    if ((${gtk2only} EQUAL 0) OR (GTK_TARGET EQUAL 2))
+        add_definitions(-D${name}_DISABLE_DEPRECATED)
+    endif ()
+endmacro()
+
+disable_deprecated(ATK 0)
+disable_deprecated(G 0)
+disable_deprecated(GDK 0)
+disable_deprecated(GDK_PIXBUF 0)
+disable_deprecated(GTK 1)
+disable_deprecated(PANGO 0)
+
 if (APPLE)
     option(XWINDOWS "Build against X11" ON)
     add_definitions(