X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=CMakeLists.txt;h=dd247e084bd1fd446c77799b43db6c2c39421aeb;hb=de06ea449dfca5a3f0a5ad1f5bd91be0225d9d3e;hp=5c388a5e06aff4927fec687bf009bee95a0bfc2e;hpb=b09c226691a731ec3da332a9fad491eb19e0ba0f;p=xonotic%2Fnetradiant.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c388a5e..dd247e08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,6 +138,10 @@ endif ()
 if (BUILD_RADIANT)
     set(GTK_TARGET 2 CACHE STRING "GTK target")
     add_definitions(-DGTK_TARGET=${GTK_TARGET})
+
+    if (GTK_TARGET EQUAL 2 AND WIN32)
+        add_definitions(-DWORKAROUND_WINDOWS_GTK2_GLWIDGET=1)
+    endif ()
 endif ()
 
 #-----------------------------------------------------------------------
@@ -212,10 +216,10 @@ if (BUILD_BINARIES)
     macro (copy_dlls target)
         if (BUNDLE_LIBRARIES AND WIN32)
             add_custom_command(TARGET ${target} POST_BUILD
-                COMMAND bash
-                ARGS -c "ldd '$<TARGET_FILE:${target}>' | egrep -i '\\.dll ' | grep -iv '/c/Windows' | awk '{ print $1 }' | while read dll; do dllbasename=\"$(which \"$dll\")\"; [ -f \"${PROJECT_BINARY_DIR}/$dllbasename\" ] || cp --preserve=timestamps \"$dllbasename\" '${PROJECT_BINARY_DIR}'; done"
+                COMMAND "${PROJECT_SOURCE_DIR}/library-bundler"
+                ARGS "windows" "$<TARGET_FILE:${target}>" "${PROJECT_BINARY_DIR}"
                 VERBATIM
-        )
+            )
         endif ()
     endmacro ()
 
@@ -324,7 +328,7 @@ set(GAMEPACKS_NAME_LIST none CACHE STRING "Download game packs by name")
 
 if (DOWNLOAD_GAMEPACKS)
     add_custom_target(game_packs ALL
-       COMMAND "${PROJECT_SOURCE_DIR}/gamepack-manager" --license ${GAMEPACKS_LICENSE_LIST} --name ${GAMEPACKS_NAME_LIST} --download-dir "${GAMEPACKS_DOWNLOAD_DIR}" --install-dir "${PROJECT_BINARY_DIR}" --download --install
+       COMMAND "${PROJECT_SOURCE_DIR}/gamepack-manager" --license ${GAMEPACKS_LICENSE_LIST} --name ${GAMEPACKS_NAME_LIST} --download-dir "${GAMEPACKS_DOWNLOAD_DIR}" --install-dir "${PROJECT_BINARY_DIR}/gamepacks" --download --install
        COMMENT "Downloading game packs"
     )
 endif ()
@@ -351,11 +355,8 @@ if (DOWNLOAD_GAMEPACKS)
        set(GAME_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
     endif ()
 
-    file(GLOB GAME_DIRS ${PROJECT_BINARY_DIR}/*.game)
-
     install(DIRECTORY
-        ${PROJECT_BINARY_DIR}/games
-        ${GAME_DIRS}
+        ${PROJECT_BINARY_DIR}/gamepacks
         DESTINATION ${RADIANT_DATA_DIR}
     )
 endif ()