summaryrefslogtreecommitdiff
path: root/plugins/CMakeLists.txt
diff options
context:
space:
mode:
authorQuietust2012-03-11 15:32:16 -0500
committerQuietust2012-03-11 15:32:16 -0500
commit27a7f97174dfbdf4af3c2b4accece57b21036dfe (patch)
treec3d02eb4cb870115264e8d6c9a06b0e2952c9478 /plugins/CMakeLists.txt
parent1124ab25fbb7f2eaaffbad017e501d67dd89ec3b (diff)
parent3b87f7bd3ad0d948211865cb2608ba75c35514bb (diff)
downloaddfhack-27a7f97174dfbdf4af3c2b4accece57b21036dfe.tar.gz
dfhack-27a7f97174dfbdf4af3c2b4accece57b21036dfe.tar.bz2
dfhack-27a7f97174dfbdf4af3c2b4accece57b21036dfe.tar.xz
Merge branch 'master' of git://github.com/peterix/dfhack
Conflicts: plugins/CMakeLists.txt
Diffstat (limited to 'plugins/CMakeLists.txt')
-rw-r--r--plugins/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 667c38c8..aba5feaa 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -81,6 +81,8 @@ if (BUILD_SUPPORTED)
DFHACK_PLUGIN(advtools advtools.cpp)
DFHACK_PLUGIN(tweak tweak.cpp)
DFHACK_PLUGIN(feature feature.cpp)
+ DFHACK_PLUGIN(lair lair.cpp)
+ # not yet. busy with other crud again...
#DFHACK_PLUGIN(versionosd versionosd.cpp)
endif()