Move autolabor to main plugin folder

plugins/CMakeLists.txt

@@ -45,11 +45,6 @@ if (BUILD_DWARFEXPORT)
     add_subdirectory (dwarfexport)
 endif()
 
-OPTION(BUILD_AUTOLABOR "Build autolabor." ON)
-if (BUILD_AUTOLABOR)
-    add_subdirectory (autolabor)
-endif()
-
 # Protobuf
 FILE(GLOB PROJECT_PROTOS ${CMAKE_CURRENT_SOURCE_DIR}/proto/*.proto)
 
@@ -72,6 +67,8 @@ if (BUILD_SUPPORTED)
     DFHACK_PLUGIN(probe probe.cpp)
     # this is a plugin which helps detect cursed creatures (vampires, necromancers, werebeasts, ...)
     DFHACK_PLUGIN(cursecheck cursecheck.cpp)
+    # automatically assign labors to dwarves!
+    DFHACK_PLUGIN(autolabor autolabor.cpp)
     DFHACK_PLUGIN(drybuckets drybuckets.cpp)
     DFHACK_PLUGIN(getplants getplants.cpp)
     DFHACK_PLUGIN(plants plants.cpp)

plugins/autolabor/CMakeLists.txt

@@ -1,31 +0,0 @@
-PROJECT (autolabor)
-# A list of source files
-SET(PROJECT_SRCS
-    autolabor.cpp
-)
-# A list of headers
-SET(PROJECT_HDRS
-    autolabor.h
-)
-SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
-
-# mash them together (headers are marked as headers and nothing will try to compile them)
-LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
-
-#linux
-IF(UNIX)
-    add_definitions(-DLINUX_BUILD)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-    )
-# windows
-ELSE(UNIX)
-    SET(PROJECT_LIBS
-        # add any extra linux libs here
-        ${PROJECT_LIBS}
-        $(NOINHERIT)
-    )
-ENDIF(UNIX)
-# this makes sure all the stuff is put in proper places and linked to dfhack
-DFHACK_PLUGIN(autolabor ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS})

plugins/autolabor/autolabor.h

@@ -1 +0,0 @@
-#pragma once