Merge remote-tracking branch 'myk002/buildingplan_format' into develop

fengjixuchui · Sep 24, 2020 · 577bb0a · 577bb0a
2 parents d43bf0c + 8660355
commit 577bb0a
Show file tree

Hide file tree

Showing 9 changed files with 1,260 additions and 1,209 deletions.
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -74,7 +74,7 @@ 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)
+add_library(buildingplan-lib STATIC buildingplan-lib.cpp buildingplan-planner.cpp buildingplan-rooms.cpp)
 target_link_libraries(buildingplan-lib dfhack)
 
 # Plugins