X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2FCMakeLists.txt;h=ddd46f275006ed468dbc9e9728e232289596537a;hb=6c135d59c0b59e4a17ba6988ae0b2d39c2165ff5;hp=e68312037978027fe6ab718bb8ded41f8bac6006;hpb=8a00fda721f6912ec1af097b9a69db4db10ffbdb;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/CMakeLists.txt b/tools/quake3/CMakeLists.txt
index e6831203..ddd46f27 100644
--- a/tools/quake3/CMakeLists.txt
+++ b/tools/quake3/CMakeLists.txt
@@ -1,16 +1,11 @@
 include_directories(BEFORE common)
 
 set(Q3MAP_VERSION 2.5.17n)
-find_package(Git REQUIRED)
-execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_VERSION
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+
 if (GIT_VERSION)
     set(Q3MAP_VERSION "${Q3MAP_VERSION}-git-${GIT_VERSION}")
 endif ()
+
 add_definitions(-DQ3MAP_VERSION="${Q3MAP_VERSION}")
 
 find_package(GLIB REQUIRED)
@@ -22,11 +17,16 @@ include_directories(${JPEG_INCLUDE_DIR})
 find_package(PNG REQUIRED)
 include_directories(${PNG_INCLUDE_DIR})
 
+find_package(WebP REQUIRED)
+include_directories(${WEBP_INCLUDE_DIR})
+
 find_package(LibXml2 REQUIRED)
 include_directories(${LIBXML2_INCLUDE_DIR})
 
-find_package(ZLIB REQUIRED)
-include_directories(${ZLIB_INCLUDE_DIRS})
+find_package(Minizip REQUIRED)
+include_directories(${Minizip_INCLUDE_DIRS})
+
+include_directories(${CMAKE_SOURCE_DIR}/libs/crnrgba)
 
 set(q3map2_games
         q3map2/game_darkplaces.h
@@ -41,15 +41,19 @@ set(q3map2_games
         q3map2/game_quake3.h
         q3map2/game_quakelive.h
         q3map2/game_reaction.h
+        q3map2/game_smokinguns.h
         q3map2/game_sof2.h
         q3map2/game_tenebrae.h
         q3map2/game_tremulous.h
+        q3map2/game_unvanquished.h
         q3map2/game_wolf.h
         q3map2/game_wolfet.h
         q3map2/game_xonotic.h
         )
 
 radiant_tool(q3map2
+        q3map2/q3map2.rc
+
         common/cmdlib.c common/cmdlib.h
         common/imagelib.c common/imagelib.h
         common/inout.c common/inout.h
@@ -63,7 +67,6 @@ radiant_tool(q3map2
         common/scriplib.c common/scriplib.h
         common/surfaceflags.h
         common/threads.c
-        common/unzip.c common/unzip.h
         common/vfs.c common/vfs.h
 
         q3map2/brush.c
@@ -116,12 +119,24 @@ radiant_tool(q3map2
         q3map2/writebsp.c
         )
 
+if (BUILD_CRUNCH)
+        set(OPTIONAL_IMAGE_LIBRARIES crnrgba)
+        set(OPTIONAL_IMAGE_DEFINES BUILD_CRUNCH=1)
+endif ()
+
+target_compile_definitions(q3map2
+        PRIVATE
+        ${OPTIONAL_IMAGE_DEFINES}
+        )
+
 target_link_libraries(q3map2
         ${GLIB_LIBRARIES}
         ${JPEG_LIBRARIES}
         ${PNG_LIBRARIES}
+        ${WEBP_LIBRARIES}
         ${LIBXML2_LIBRARIES}
-        ${ZLIB_LIBRARIES}
+        ${Minizip_LIBRARIES}
+        ${OPTIONAL_IMAGE_LIBRARIES}
         ddslib
         etclib
         filematch
@@ -131,6 +146,8 @@ target_link_libraries(q3map2
         )
 
 radiant_tool(q3data
+        q3data/q3data.rc
+
         common/aselib.c common/aselib.h
         common/bspfile.c common/bspfile.h
         common/cmdlib.c common/cmdlib.h
@@ -139,7 +156,6 @@ radiant_tool(q3data
         common/md4.c common/md4.h
         common/scriplib.c common/scriplib.h
         common/trilib.c common/trilib.h
-        common/unzip.c common/unzip.h
         common/vfs.c common/vfs.h
 
         q3data/3dslib.c q3data/3dslib.h
@@ -157,7 +173,7 @@ radiant_tool(q3data
 target_link_libraries(q3data
         ${GLIB_LIBRARIES}
         ${LIBXML2_LIBRARIES}
-        ${ZLIB_LIBRARIES}
+        ${Minizip_LIBRARIES}
         filematch
         etclib
         l_net