summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mrázek2011-10-30 19:56:08 +0100
committerPetr Mrázek2011-10-30 19:56:08 +0100
commit2dfee0a9f9cb7d77c547f6a6cd615996139fcd67 (patch)
tree73f0a77c78ef9b480d9536ed1ad2ef0df301a3c6
parent063894276c48a225aed201b305f5a2ee4e0bed91 (diff)
downloaddfhack-2dfee0a9f9cb7d77c547f6a6cd615996139fcd67.tar.gz
dfhack-2dfee0a9f9cb7d77c547f6a6cd615996139fcd67.tar.bz2
dfhack-2dfee0a9f9cb7d77c547f6a6cd615996139fcd67.tar.xz
Move df2mc to devel
-rw-r--r--.gitmodules4
-rw-r--r--plugins/CMakeLists.txt6
-rw-r--r--plugins/devel/CMakeLists.txt5
m---------plugins/devel/df2mc0
m---------plugins/df2mc0
5 files changed, 7 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index 5fcc3ec0..a5baa231 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "plugins/stonesense"]
path = plugins/stonesense
url = git://github.com/peterix/stonesense.git
-[submodule "plugins/df2mc"]
- path = plugins/df2mc
+[submodule "plugins/devel/df2mc"]
+ path = plugins/devel/df2mc
url = git://github.com/peterix/DF2MC.git
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 045943c1..cd66e415 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -20,12 +20,6 @@ if(BUILD_STONESENSE)
add_subdirectory (stonesense)
endif()
-OPTION(BUILD_DF2MC "Build DF2MC (needs a checkout first)." ON)
-if(BUILD_DF2MC)
- add_subdirectory (df2mc)
-endif()
-
-
OPTION(BUILD_DEV_PLUGINS "Build developer plugins." OFF)
if(BUILD_DEV_PLUGINS)
add_subdirectory (devel)
diff --git a/plugins/devel/CMakeLists.txt b/plugins/devel/CMakeLists.txt
index 31c31a22..33750ab4 100644
--- a/plugins/devel/CMakeLists.txt
+++ b/plugins/devel/CMakeLists.txt
@@ -9,3 +9,8 @@ DFHACK_PLUGIN(notes notes.cpp)
DFHACK_PLUGIN(memview memview.cpp)
DFHACK_PLUGIN(buildprobe buildprobe.cpp)
#DFHACK_PLUGIN(tiles tiles.cpp)
+
+OPTION(BUILD_DF2MC "Build DF2MC (needs a checkout first)." ON)
+if(BUILD_DF2MC)
+ add_subdirectory (df2mc)
+endif()
diff --git a/plugins/devel/df2mc b/plugins/devel/df2mc
new file mode 160000
+Subproject 068787ba6c71311639ca4806a3609fa800ba658
diff --git a/plugins/df2mc b/plugins/df2mc
deleted file mode 160000
-Subproject f23b5c29119f0e3621da66ac621f1993948be55