mirror of
https://github.com/Zelda64Recomp/Zelda64Recomp.git
synced 2026-04-26 12:11:38 +00:00
Use compile-time macro for Flatpak instead.
This commit is contained in:
parent
f9d6c8b4ae
commit
91fc309f0e
2 changed files with 5 additions and 7 deletions
|
|
@ -28,7 +28,7 @@
|
||||||
"./N64Recomp us.rev1.toml",
|
"./N64Recomp us.rev1.toml",
|
||||||
"./RSPRecomp aspMain.us.rev1.toml",
|
"./RSPRecomp aspMain.us.rev1.toml",
|
||||||
"./RSPRecomp njpgdspMain.us.rev1.toml",
|
"./RSPRecomp njpgdspMain.us.rev1.toml",
|
||||||
"cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_MAKE_PROGRAM=ninja -DPATCHES_C_COMPILER=clang -DPATCHES_LD=ld.lld -G Ninja -S . -B cmake-build",
|
"cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_MAKE_PROGRAM=ninja -DPATCHES_C_COMPILER=clang -DPATCHES_LD=ld.lld -DZELDA64RECOMP_FLATPAK -G Ninja -S . -B cmake-build",
|
||||||
"cmake --build cmake-build --config Release --target Zelda64Recompiled --parallel",
|
"cmake --build cmake-build --config Release --target Zelda64Recompiled --parallel",
|
||||||
"rm -rf assets/scss",
|
"rm -rf assets/scss",
|
||||||
"mkdir -p /app/bin",
|
"mkdir -p /app/bin",
|
||||||
|
|
|
||||||
|
|
@ -48,13 +48,11 @@ namespace zelda64 {
|
||||||
std::filesystem::path get_program_path() {
|
std::filesystem::path get_program_path() {
|
||||||
#if defined(__APPLE__)
|
#if defined(__APPLE__)
|
||||||
return get_bundle_resource_directory();
|
return get_bundle_resource_directory();
|
||||||
#elif defined(__linux__)
|
#elif defined(__linux__) && defined(ZELDA64RECOMP_FLATPAK)
|
||||||
std::error_code ec;
|
return "/app/bin";
|
||||||
if (std::filesystem::exists("/.flatpak-info", ec)) {
|
#else
|
||||||
return "/app/bin";
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
return "";
|
return "";
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
std::filesystem::path get_asset_path(const char* asset) {
|
std::filesystem::path get_asset_path(const char* asset) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue