From 97bccb5239b96aad185ab85b296afe1ffbdb0441 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 2 Jul 2013 10:02:38 +0200 Subject: [PATCH] - adjusted CMakeLists.txt for brightmaps.pk3 and lights.pk3 to same style as for gzdoom.pk3 --- wadsrc_bm/CMakeLists.txt | 8 +------- wadsrc_lights/CMakeLists.txt | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/wadsrc_bm/CMakeLists.txt b/wadsrc_bm/CMakeLists.txt index b79de7138..a76c5dc36 100644 --- a/wadsrc_bm/CMakeLists.txt +++ b/wadsrc_bm/CMakeLists.txt @@ -1,9 +1,3 @@ cmake_minimum_required( VERSION 2.4 ) -add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/brightmaps.pk3 - COMMAND ${CMAKE_BINARY_DIR}/tools/zipdir/zipdir ${ZDOOM_OUTPUT_DIR}/brightmaps.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static ${CMAKE_CURRENT_BINARY_DIR}/generated - DEPENDS zipdir ${CMAKE_CURRENT_SOURCE_DIR}/static ) - -add_custom_target( brightmaps_pk3 ALL - DEPENDS ${ZDOOM_OUTPUT_DIR}/brightmaps.pk3 ) - +add_pk3(brightmaps.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static) diff --git a/wadsrc_lights/CMakeLists.txt b/wadsrc_lights/CMakeLists.txt index 6bdb11e92..92f89314a 100644 --- a/wadsrc_lights/CMakeLists.txt +++ b/wadsrc_lights/CMakeLists.txt @@ -1,9 +1,3 @@ cmake_minimum_required( VERSION 2.4 ) -add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/lights.pk3 - COMMAND ${CMAKE_BINARY_DIR}/tools/zipdir/zipdir ${ZDOOM_OUTPUT_DIR}/lights.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static ${CMAKE_CURRENT_BINARY_DIR}/generated - DEPENDS zipdir ${CMAKE_CURRENT_SOURCE_DIR}/static ) - -add_custom_target( lights_pk3 ALL - DEPENDS ${ZDOOM_OUTPUT_DIR}/lights.pk3 ) - +add_pk3(lights.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)