mirror of
https://github.com/open-goal/jak-project
synced 2026-07-07 14:13:45 -04:00
Move duplicated utilities to the common util folder and remove NEXT_DIR (#29)
* move things to the common library and remove next_dir * fix for windows * one last windows fix * last fix for real this time * debug listener test * fix listener threading bug
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include "config.h"
|
||||
#include "third-party/json.hpp"
|
||||
#include "util/FileIO.h"
|
||||
#include "common/util/FileUtil.h"
|
||||
|
||||
Config gConfig;
|
||||
|
||||
@@ -9,7 +10,7 @@ Config& get_config() {
|
||||
}
|
||||
|
||||
void set_config(const std::string& path_to_config_file) {
|
||||
auto config_str = read_text_file(path_to_config_file);
|
||||
auto config_str = file_util::read_text_file(path_to_config_file);
|
||||
// to ignore comments in json, which may be useful
|
||||
auto cfg = nlohmann::json::parse(config_str, nullptr, true, true);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user