From 0d1668a7a5a22f571aa00f8712b5481d9e68db17 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 4 Sep 2021 20:53:10 -0700 Subject: [PATCH] merge buildingplan-lib into buildingplan so no one else is tempted to use it as a library. starting buildingplan from two separate plugins just runs two completely separate engines with separate state, one of which is completely inaccessible from the UI. --- plugins/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 4fb844e6a..bf3c31678 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -74,9 +74,6 @@ add_custom_target(generate_proto DEPENDS ${PROJECT_PROTO_TMP_FILES}) set_source_files_properties( Brushes.h PROPERTIES HEADER_FILE_ONLY TRUE ) -add_library(buildingplan-lib STATIC buildingplan-lib.cpp buildingplan-planner.cpp buildingplan-rooms.cpp) -target_link_libraries(buildingplan-lib dfhack) - # Plugins option(BUILD_SUPPORTED "Build the supported plugins (reveal, probe, etc.)." ON) if(BUILD_SUPPORTED) @@ -96,7 +93,7 @@ if(BUILD_SUPPORTED) dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua) dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua) dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua) - dfhack_plugin(buildingplan buildingplan.cpp LINK_LIBRARIES lua buildingplan-lib) + dfhack_plugin(buildingplan buildingplan.cpp buildingplan-lib.cpp buildingplan-planner.cpp buildingplan-rooms.cpp LINK_LIBRARIES lua) dfhack_plugin(changeitem changeitem.cpp) dfhack_plugin(changelayer changelayer.cpp) dfhack_plugin(changevein changevein.cpp)