mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-10 12:25:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove assets folder, use more std::filesystem (#1575)

Browse Source 
* Remove assets folder, use more std::filesystem

* windows fix

* another one for windows

* another one

* better system for different folders

* rm debugging stuff

* let extractor override everything

* dont revert jak1 change
This commit is contained in:
water111
2022-06-29 23:32:46 -04:00
committed by GitHub
parent 36dc015d62
commit 1e33dcda4b
36 changed files with 486 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/offline/offline_test_main.cpp
+6 -6
View File
@@ -264,20 +264,20 @@ Decompiler setup_decompiler(const std::vector<DecompilerFile>& files,
// don't try to do this because we can't write the file
dc.config->generate_symbol_definition_map = false;
std::vector<std::string> dgo_paths;
std::vector<std::filesystem::path> dgo_paths;
if (args.iso_data_path.empty()) {
for (auto& x : offline_config.dgos) {
dgo_paths.push_back((file_util::get_jak_project_dir() / "iso_data" / "jak1" / x).string());
dgo_paths.push_back(file_util::get_jak_project_dir() / "iso_data" / "jak1" / x);
}
} else {
for (auto& x : offline_config.dgos) {
dgo_paths.push_back(file_util::combine_path(args.iso_data_path, x));
dgo_paths.push_back(std::filesystem::path(args.iso_data_path) / x);
}
}
dc.db = std::make_unique<decompiler::ObjectFileDB>(dgo_paths, dc.config->obj_file_name_map_file,
std::vector<std::string>{},
std::vector<std::string>{}, *dc.config);
dc.db = std::make_unique<decompiler::ObjectFileDB>(
dgo_paths, dc.config->obj_file_name_map_file, std::vector<std::filesystem::path>{},
std::vector<std::filesystem::path>{}, *dc.config);
std::unordered_set<std::string> db_files;
for (auto& files_by_name : dc.db->obj_files_by_name) {