From 91fc309f0e1710bdfd7b5520468afab605ef9983 Mon Sep 17 00:00:00 2001 From: Dario Date: Sat, 3 May 2025 18:59:56 -0300 Subject: [PATCH] Use compile-time macro for Flatpak instead. --- flatpak/io.github.zelda64recomp.zelda64recomp.json | 2 +- src/main/support.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/flatpak/io.github.zelda64recomp.zelda64recomp.json b/flatpak/io.github.zelda64recomp.zelda64recomp.json index 8430401..ed3cf0b 100644 --- a/flatpak/io.github.zelda64recomp.zelda64recomp.json +++ b/flatpak/io.github.zelda64recomp.zelda64recomp.json @@ -28,7 +28,7 @@ "./N64Recomp us.rev1.toml", "./RSPRecomp aspMain.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", "rm -rf assets/scss", "mkdir -p /app/bin", diff --git a/src/main/support.cpp b/src/main/support.cpp index daad4d2..94375ec 100644 --- a/src/main/support.cpp +++ b/src/main/support.cpp @@ -48,13 +48,11 @@ namespace zelda64 { std::filesystem::path get_program_path() { #if defined(__APPLE__) return get_bundle_resource_directory(); -#elif defined(__linux__) - std::error_code ec; - if (std::filesystem::exists("/.flatpak-info", ec)) { - return "/app/bin"; - } -#endif +#elif defined(__linux__) && defined(ZELDA64RECOMP_FLATPAK) + return "/app/bin"; +#else return ""; +#endif } std::filesystem::path get_asset_path(const char* asset) {