mirror of
https://github.com/open-goal/jak-project
synced 2026-08-21 23:00:45 -04:00
build: get rid of clang-cl in favor of actual clang among other things (#1589)
* git: ignore vs build dir * cmake: ditch `clang-cl` on windows in favor of actual `clang` * build: suppress a significant number of warnings * build: adjust workflows and vendor nasm * docs: update docs to remove `clang-cl` mentions * build: fix some copy-paste mistakes in the linux build * build: remove C++20 compat warnings as that is useful if we want to upgrade
This commit is contained in:
@@ -116,15 +116,15 @@ std::optional<std::string> try_get_jak_project_path() {
|
||||
return {};
|
||||
}
|
||||
|
||||
return std::string(my_path).substr(
|
||||
0, pos + 11); // + 12 to include "/jak-project" in the returned filepath
|
||||
return std::make_optional(std::string(my_path).substr(
|
||||
0, pos + 11)); // + 12 to include "/jak-project" in the returned filepath
|
||||
}
|
||||
|
||||
std::optional<std::filesystem::path> try_get_data_dir() {
|
||||
std::filesystem::path my_path = get_current_executable_path();
|
||||
auto data_dir = my_path.parent_path() / "data";
|
||||
if (std::filesystem::exists(data_dir) && std::filesystem::is_directory(data_dir)) {
|
||||
return data_dir;
|
||||
return std::make_optional(data_dir);
|
||||
} else {
|
||||
return {};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user