summaryrefslogtreecommitdiff
path: root/games-util/dfhack/files/dfhack-9999/05-compile-time-configurable-0.patch
diff options
context:
space:
mode:
Diffstat (limited to 'games-util/dfhack/files/dfhack-9999/05-compile-time-configurable-0.patch')
-rw-r--r--games-util/dfhack/files/dfhack-9999/05-compile-time-configurable-0.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/games-util/dfhack/files/dfhack-9999/05-compile-time-configurable-0.patch b/games-util/dfhack/files/dfhack-9999/05-compile-time-configurable-0.patch
deleted file mode 100644
index c35d8e37..00000000
--- a/games-util/dfhack/files/dfhack-9999/05-compile-time-configurable-0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-compile-time configurable paths
-
-From: eroen <eroen@occam.eroen.eu>
-
-hack/
-./
----
- library/Core.cpp | 8 ++++++++
- plugins/zone.cpp | 2 ++
- 2 files changed, 10 insertions(+)
-
-diff --git a/library/Core.cpp b/library/Core.cpp
-index e72decd..89130a9 100644
---- a/library/Core.cpp
-+++ b/library/Core.cpp
-@@ -317,7 +317,11 @@ static command_result runRubyScript(color_ostream &out, PluginManager *plug_mgr,
- rbcmd += "'" + args[i] + "', ";
- rbcmd += "]\n";
-
-+#ifdef DFHACK_DATA_DESTINATION
-+ rbcmd += "catch(:script_finished) { load '" DFHACK_DATA_DESTINATION "/scripts/" + name + ".rb' }";
-+#else
- rbcmd += "catch(:script_finished) { load './hack/scripts/" + name + ".rb' }";
-+#endif
-
- return plug_mgr->eval_ruby(out, rbcmd.c_str());
- }
-@@ -862,7 +866,11 @@ void Core::fatal (std::string output, bool deactivate)
- std::string Core::getHackPath()
- {
- #ifdef LINUX_BUILD
-+ #ifdef DFHACK_DATA_DESTINATION
-+ return DFHACK_DATA_DESTINATION "/";
-+ #else
- return p->getPath() + "/hack/";
-+ #endif
- #else
- return p->getPath() + "\\hack\\";
- #endif
-diff --git a/plugins/zone.cpp b/plugins/zone.cpp
-index 5649da2..e89419a 100644
---- a/plugins/zone.cpp
-+++ b/plugins/zone.cpp
-@@ -3177,8 +3177,10 @@ command_result df_autobutcher(color_ostream &out, vector <string> & parameters)
- {
- string run = "dfhack-run autobutcher ";
- #ifdef LINUX_BUILD
-+#ifndef DFHACK_DATA_DESTINATION
- run = "./dfhack-run autobutcher ";
- #endif
-+#endif
- // force creation of config
- out << run << "start" << endl;
-