MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move JSON files out of hack/ folder

develop
lethosor 2015-05-09 16:04:15 -04:00
parent b6ec48c99a
commit 6eb929b306
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
Unescape Escape View File

@ -173,6 +173,8 @@ IF(BUILD_LIBRARY)
install(DIRECTORY images DESTINATION ${DFHACK_USERDOC_DESTINATION}) install(DIRECTORY images DESTINATION ${DFHACK_USERDOC_DESTINATION})
endif() endif()
install(DIRECTORY dfhack-config DESTINATION .)
#build the plugins #build the plugins
IF(BUILD_PLUGINS) IF(BUILD_PLUGINS)
add_subdirectory (plugins) add_subdirectory (plugins)

2
Readme.rst
Unescape Escape View File

@ -1700,7 +1700,7 @@ Options:
``dwarfmonitor prefs``: ``dwarfmonitor prefs``:
Show dwarf preferences summary Show dwarf preferences summary
``dwarfmonitor reload``: ``dwarfmonitor reload``:
Reload configuration file (``hack/config/dwarfmonitor.json``) Reload configuration file (``dfhack-config/dwarfmonitor.json``)
Configuration options: Configuration options:

3
dfhack-config/dwarfmonitor.json
Unescape Escape View File

@ -0,0 +1,3 @@
{
"date_format": "y-m-d"
}

2
plugins/dwarfmonitor.cpp
Unescape Escape View File

@ -1849,7 +1849,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
static bool load_config (color_ostream &out) static bool load_config (color_ostream &out)
{ {
jsonxx::Object o; jsonxx::Object o;
std::ifstream infile("hack/config/dwarfmonitor.json"); std::ifstream infile("dfhack-config/dwarfmonitor.json");
if (infile.good()) if (infile.good())
{ {
std::string contents((std::istreambuf_iterator<char>(infile)), (std::istreambuf_iterator<char>())); std::string contents((std::istreambuf_iterator<char>(infile)), (std::istreambuf_iterator<char>()));