X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=CMakeLists.txt;h=b2fa296e953cd9c6c2fcfec248b5a3afd8bd3ab1;hb=1860b17524615ad56c425604fd7b5eda4652e7ea;hp=92734d5eaa315368dff8bc905707e3ae7fae16a0;hpb=1c3a97f39c01a76cc6255ca064d39d2225637b0a;p=xonotic%2Fnetradiant.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92734d5e..b2fa296e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ if (APPLE)
 endif ()
 
 set(BUILTIN_GTKGLEXT_BUILT OFF CACHE INTERNAL "...")
-if (EXISTS "${BUILTINS_INSTALL_DIR}/lib/pkgconfig/gtkglext-1.0.pc")
+if (EXISTS "${BUILTINS_PKGCONFIG_DIR}gtkglext-1.0.pc")
     set(BUILTIN_GTKGLEXT_BUILT ON)
 endif ()
 
@@ -252,6 +252,7 @@ if (BUILD_RADIANT)
         if (GTK_TARGET EQUAL 2)
             add_definitions(-DWORKAROUND_MACOS_GTK2_DESTROY=1)
             add_definitions(-DWORKAROUND_MACOS_GTK2_GLWIDGET=1)
+            add_definitions(-DWORKAROUND_MACOS_GTK2_LAGGYPOINTER=1)
         endif ()
     endif ()
 endif ()
@@ -352,17 +353,29 @@ if (BUILTIN_GTKGLEXT OR BUILTIN_GTKTHEME_MOJAVE)
 endif ()
 
 if (BUILTIN_GTKGLEXT)
-    execute_process(COMMAND pkg-config --libs gdk-2.0 gtk+-2.0 glib-2.0 gl
+    set(GTKGLEXT_PKGNAMES "gdk-2.0 gtk+-2.0 glib-2.0")
+
+    if (NOT APPLE)
+        set(GTKGLEXT_PKGNAMES "${GTKGLEXT_PKGNAMES} gl")
+    endif ()
+
+    execute_process(COMMAND pkg-config --libs ${GTKGLEXT_PKGNAMES}
         OUTPUT_VARIABLE GTKGLEXT_LDFLAGS
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+
     set(GTKGLEXT_LDFLAGS "$ENV{LDFLAGS} -lm ${GTKGLEXT_LDFLAGS}")
 
+    execute_process(COMMAND pkg-config --cflags ${GTKGLEXT_PKGNAMES}
+        OUTPUT_VARIABLE GTKGLEXT_CFLAGS
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    set(GTKGLEXT_CFLAGS "$ENV{CFLAGS} ${GTKGLEXT_CFLAGS}")
+
     if (NOT CMAKE_BUILD_TYPE MATCHES Release)
-        set(GTKGLEXT_CFLAGS "$ENV{CFLAGS} -g")
-    else ()
-        set(GTKGLEXT_CFLAGS "$ENV{CFLAGS}")
-    endif()
+        set(GTKGLEXT_CFLAGS "${GTKGLEXT_CFLAGS} -g")
+    endif ()
 
     set(CONFIGURE_OPTIONS --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf)
 
@@ -372,20 +385,29 @@ if (BUILTIN_GTKGLEXT)
         set(GTKGLEXT_GIT_TAG fixes)
     endif ()
 
+    if (APPLE)
+        set(GTKGLEXT_CFLAGS "${GTKGLEXT_CFLAGS} -DGL_SILENCE_DEPRECATION=1")
+        # FIXME: OpenGL deprecation warnings are not silenced
+        # in Objective C code.
+    endif ()
+
     ExternalProject_Add(gtkglext
         GIT_REPOSITORY https://gitlab.gnome.org/illwieckz/gtkglext.git
         GIT_TAG ${GTKGLEXT_GIT_TAG}
         BUILD_IN_SOURCE ON
-        CONFIGURE_COMMAND export LDFLAGS=${GTKGLEXT_LDFLAGS}
-        CONFIGURE_COMMAND && NOCONFIGURE=1 ./autogen.sh
+        CONFIGURE_COMMAND export CFLAGS=${GTKGLEXT_LDFLAGS}
+        CONFIGURE_COMMAND && export LDFLAGS=${GTKGLEXT_CFLAGS}
+        CONFIGURE_COMMAND && export NOCONFIGURE=1
+        CONFIGURE_COMMAND && ./autogen.sh
         CONFIGURE_COMMAND && ./configure --prefix "${BUILTINS_INSTALL_DIR}" ${CONFIGURE_OPTIONS}
-        BUILD_COMMAND GL_SILENCE_DEPRECATION=1
-        BUILD_COMMAND && $(MAKE) CFLAGS=${GTKGLEXT_CFLAGS} LDFLAGS=${GTKGLEXT_LDFLAGS}
+        BUILD_COMMAND $(MAKE)
+        BUILD_COMMAND CFLAGS=${GTKGLEXT_CFLAGS}
+        BUILD_COMMAND LDFLAGS=${GTKGLEXT_LDFLAGS}
         INSTALL_COMMAND $(MAKE) install
     )
 
-    include_directories("${BUILTINS_INSTALL_DIR}/lib/gtkglext-1.0/include")
-    include_directories("${BUILTINS_INSTALL_DIR}/include/gtkglext-1.0")
+    include_directories("${BUILTINS_INCLUDE_DIR}/gtkglext-1.0")
+    include_directories("${BUILTINS_LIB_DIR}/gtkglext-1.0/include")
 
     add_dependencies(builtins gtkglext)
     set_target_properties(gtkglext PROPERTIES EXCLUDE_FROM_ALL ON)