diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 36efb82e1..f3afa3f23 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -65,6 +65,10 @@ OPTION(BUILD_SUPPORTED "Build the supported plugins (reveal, probe, etc.)." ON) if (BUILD_SUPPORTED) DFHACK_PLUGIN(reveal reveal.cpp) DFHACK_PLUGIN(probe probe.cpp) + # this is a plugin which helps detect cursed creatures (vampires, necromancers, werebeasts, ...) + DFHACK_PLUGIN(cursecheck cursecheck.cpp) + # alternative version of liquids which can be used non-interactively after configuring it + DFHACK_PLUGIN(liquidsgo liquidsgo.cpp) DFHACK_PLUGIN(drybuckets drybuckets.cpp) DFHACK_PLUGIN(getplants getplants.cpp) DFHACK_PLUGIN(plants plants.cpp) @@ -109,14 +113,3 @@ if(BUILD_SKELETON) add_subdirectory(skeleton) endif() -# this is a plugin which helps detect cursed creatures (vampires, necromancers, werebeasts, ...) -OPTION(BUILD_CURSECHECK "Build the cursecheck plugin." ON) -if(BUILD_CURSECHECK) - add_subdirectory(cursecheck) -endif() - -# alternative version of liquids which can be used non-interactively after configuring it -OPTION(BUILD_LIQUIDSGO "Build the liquidsgo plugin." ON) -if(BUILD_LIQUIDSGO) - add_subdirectory(liquidsgo) -endif() diff --git a/plugins/cursecheck/cursecheck.cpp b/plugins/cursecheck.cpp similarity index 100% rename from plugins/cursecheck/cursecheck.cpp rename to plugins/cursecheck.cpp diff --git a/plugins/cursecheck/CMakeLists.txt b/plugins/cursecheck/CMakeLists.txt deleted file mode 100644 index 0c94976db..000000000 --- a/plugins/cursecheck/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -PROJECT (cursecheck) -# A list of source files -SET(PROJECT_SRCS - cursecheck.cpp -) -# A list of headers -SET(PROJECT_HDRS - cursecheck.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}) - -# option to use a thread for no particular reason -#OPTION(SKELETON_THREAD "Use threads in the skeleton plugin." ON) -#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(cursecheck ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS}) diff --git a/plugins/cursecheck/cursecheck.h b/plugins/cursecheck/cursecheck.h deleted file mode 100644 index 7b9637ef9..000000000 --- a/plugins/cursecheck/cursecheck.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once \ No newline at end of file diff --git a/plugins/liquidsgo/liquidsgo.cpp b/plugins/liquidsgo.cpp similarity index 100% rename from plugins/liquidsgo/liquidsgo.cpp rename to plugins/liquidsgo.cpp diff --git a/plugins/liquidsgo/CMakeLists.txt b/plugins/liquidsgo/CMakeLists.txt deleted file mode 100644 index cdae8efd7..000000000 --- a/plugins/liquidsgo/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -PROJECT (liquidsgo) -# A list of source files -SET(PROJECT_SRCS - liquidsgo.cpp -) -# A list of headers -SET(PROJECT_HDRS - liquidsgo.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}) - -# option to use a thread for no particular reason -#OPTION(SKELETON_THREAD "Use threads in the skeleton plugin." ON) -#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(liquidsgo ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS}) diff --git a/plugins/liquidsgo/liquidsgo.h b/plugins/liquidsgo/liquidsgo.h deleted file mode 100644 index 7b9637ef9..000000000 --- a/plugins/liquidsgo/liquidsgo.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once \ No newline at end of file