X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fgtkutil%2FCMakeLists.txt;h=80eca88c62457f699f813b1d7cce4f00b93a0366;hb=7b51c9cbca692b2da959845a246847cec35e3939;hp=fea03d80cbd639975f5ed4e92dbf4e01df0dee33;hpb=96cdce5ea994fc35dc6ceada878d7f717352f2fb;p=xonotic%2Fnetradiant.git

diff --git a/libs/gtkutil/CMakeLists.txt b/libs/gtkutil/CMakeLists.txt
index fea03d80..80eca88c 100644
--- a/libs/gtkutil/CMakeLists.txt
+++ b/libs/gtkutil/CMakeLists.txt
@@ -1,9 +1,9 @@
-add_library(gtkutil
+add_library(gtkutil STATIC
         accelerator.cpp accelerator.h
         button.cpp button.h
         clipboard.cpp clipboard.h
-        closure.cpp closure.h
-        container.cpp container.h
+        closure.h
+        container.h
         cursor.cpp cursor.h
         dialog.cpp dialog.h
         entry.cpp entry.h
@@ -11,13 +11,13 @@ add_library(gtkutil
         frame.cpp frame.h
         glfont.cpp glfont.h
         glwidget.cpp glwidget.h
-        idledraw.cpp idledraw.h
+        idledraw.h
         image.cpp image.h
         menu.cpp menu.h
         messagebox.cpp messagebox.h
         nonmodal.cpp nonmodal.h
         paned.cpp paned.h
-        pointer.cpp pointer.h
+        pointer.h
         toolbar.cpp toolbar.h
         widget.cpp widget.h
         window.cpp window.h
@@ -27,9 +27,11 @@ add_library(gtkutil
 target_include_directories(gtkutil PRIVATE uilib)
 target_link_libraries(gtkutil PRIVATE uilib)
 
-target_include_directories(gtkutil PRIVATE ${GTK2_PANGO_INCLUDE_DIR})
-target_link_libraries(gtkutil PRIVATE ${GTK2_PANGO_LIBRARY})
+target_include_directories(gtkutil PRIVATE ${GTK${GTK_TARGET}_INCLUDE_DIRS})
+target_link_libraries(gtkutil PRIVATE ${GTK${GTK_TARGET}_LIBRARIES})
 
-find_package(GtkGLExt REQUIRED)
-target_include_directories(gtkutil PRIVATE ${GTKGL_INCLUDE_DIRS})
-target_link_libraries(gtkutil PRIVATE ${GTKGL_LIBRARIES})
+if (GTK_TARGET EQUAL 2)
+    find_package(GtkGLExt REQUIRED)
+    target_include_directories(gtkutil PRIVATE ${GtkGLExt_INCLUDE_DIRS})
+    target_link_libraries(gtkutil PRIVATE ${GtkGLExt_LIBRARIES})
+endif ()