From 7898e189dffe2a46d834c07ea161e6327389869e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 28 Apr 2015 09:40:57 +0200 Subject: [PATCH] - fixed problems in CMake project files: * thingdef_function.cpp no longer exists * the build rule for zcc-parse.c was not correct. --- src/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 271ead5a1..31a2d2055 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -636,7 +636,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CUR WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS lemon ${CMAKE_CURRENT_SOURCE_DIR}/xlat/xlat_parser.y ) -add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.lemon ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.h +add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.c ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.h COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/zscript/zcc-parse.lemon . COMMAND ${LEMON_EXE} zcc-parse.lemon WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} @@ -1081,7 +1081,6 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE thingdef/thingdef_data.cpp thingdef/thingdef_exp.cpp thingdef/thingdef_expression.cpp - thingdef/thingdef_function.cpp thingdef/thingdef_parse.cpp thingdef/thingdef_properties.cpp thingdef/thingdef_states.cpp