X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2FCMakeLists.txt;h=b1e8e67b3dd8fbd29af0d142a6147908db94b6a5;hb=852882b1cfbbcf418e7b4753ed90c0e911d3f4e1;hp=3314788b4e76c093ac5cb9aebd7f6461cca2f81e;hpb=a68115c805c158e21a4b6574026a91e0ae58bfac;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/CMakeLists.txt b/tools/quake3/CMakeLists.txt
index 3314788b..b1e8e67b 100644
--- a/tools/quake3/CMakeLists.txt
+++ b/tools/quake3/CMakeLists.txt
@@ -22,12 +22,20 @@ 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
         q3map2/game_dq.h
@@ -44,6 +52,7 @@ set(q3map2_games
         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
@@ -63,7 +72,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
@@ -80,6 +88,7 @@ radiant_tool(q3map2
         q3map2/convert_map.c
         q3map2/convert_obj.c
         q3map2/decals.c
+        q3map2/exportents.c
         q3map2/facebsp.c
         q3map2/fixaas.c
         q3map2/fog.c
@@ -115,12 +124,25 @@ 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}
+        ${Minizip_LIBRARIES}
         ${ZLIB_LIBRARIES}
+        ${OPTIONAL_IMAGE_LIBRARIES}
         ddslib
         etclib
         filematch
@@ -138,7 +160,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
@@ -156,6 +177,7 @@ radiant_tool(q3data
 target_link_libraries(q3data
         ${GLIB_LIBRARIES}
         ${LIBXML2_LIBRARIES}
+        ${Minizip_LIBRARIES}
         ${ZLIB_LIBRARIES}
         filematch
         etclib