thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-27 04:41:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed paths

Browse source
This commit is contained in:
Jujstme 2025-03-06 22:57:25 +01:00
parent 13c0146b42
commit 2873fac43a
5 changed files with 20 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
UnleashedRecomp/CMakeLists.txt
View file

@ -4,10 +4,6 @@ if (WIN32)
option(UNLEASHED_RECOMP_D3D12 "Add D3D12 support for rendering" ON) option(UNLEASHED_RECOMP_D3D12 "Add D3D12 support for rendering" ON)
endif() endif()
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
option(UNLEASHED_RECOMP_FLATPAK "Configure the build for Flatpak compatibility." OFF)
endif()
function(BIN2C) function(BIN2C)
cmake_parse_arguments(BIN2C_ARGS "" "TARGET_OBJ;SOURCE_FILE;DEST_FILE;ARRAY_NAME;COMPRESSION_TYPE" "" ${ARGN}) cmake_parse_arguments(BIN2C_ARGS "" "TARGET_OBJ;SOURCE_FILE;DEST_FILE;ARRAY_NAME;COMPRESSION_TYPE" "" ${ARGN})
@ -300,13 +296,6 @@ else()
add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES}) add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES})
endif() endif()
if (UNLEASHED_RECOMP_FLATPAK)
target_compile_definitions(UnleashedRecomp PRIVATE
"UNLEASHED_RECOMP_FLATPAK"
"GAME_INSTALL_DIRECTORY_PREPROC=\"/var/data\""
)
endif()
if (UNLEASHED_RECOMP_D3D12) if (UNLEASHED_RECOMP_D3D12)
find_package(directx-headers CONFIG REQUIRED) find_package(directx-headers CONFIG REQUIRED)
find_package(directx12-agility CONFIG REQUIRED) find_package(directx12-agility CONFIG REQUIRED)

13
UnleashedRecomp/user/config.cpp
View file

@ -5,15 +5,16 @@
std::vector<IConfigDef*> g_configDefinitions; std::vector<IConfigDef*> g_configDefinitions;
const bool g_isRuntimeFlatpak =
#if defined(__linux__)
getenv("FLATPAK_SANDBOX_DIR") != nullptr;
#else
false;
#endif
#define CONFIG_DEFINE_ENUM_TEMPLATE(type) \ #define CONFIG_DEFINE_ENUM_TEMPLATE(type) \
static std::unordered_map<std::string, type> g_##type##_template = static std::unordered_map<std::string, type> g_##type##_template =
#if defined(__linux__)
const bool g_isRuntimeFlatpak = getenv("FLATPAK_SANDBOX_DIR") != nullptr;
#else
const bool g_isRuntimeFlatpak = false;
#endif
CONFIG_DEFINE_ENUM_TEMPLATE(ELanguage) CONFIG_DEFINE_ENUM_TEMPLATE(ELanguage)
{ {
{ "English", ELanguage::English }, { "English", ELanguage::English },

18
UnleashedRecomp/user/paths.cpp
View file

@ -4,32 +4,36 @@
std::filesystem::path g_executableRoot = os::process::GetExecutablePath().remove_filename(); std::filesystem::path g_executableRoot = os::process::GetExecutablePath().remove_filename();
std::filesystem::path g_userPath = BuildUserPath(); std::filesystem::path g_userPath = BuildUserPath();
extern const std::string g_gamepath = GetGamePath().string(); extern const std::string g_gamepath = GetGamePath();
bool CheckPortable() bool CheckPortable()
{ {
return std::filesystem::exists(g_executableRoot / "portable.txt"); return std::filesystem::exists(g_executableRoot / "portable.txt");
} }
std::filesystem::path GetGamePath() std::string GetGamePath()
{ {
#if defined(__linux__) #if defined(__linux__)
if (g_isRuntimeFlatpak || CheckPortable()) if (g_isRuntimeFlatpak)
return GAME_INSTALL_DIRECTORY_PREPROC; return "/var/data";
if (CheckPortable())
return g_executableRoot.string();
const char* homeDir = getenv("HOME"); const char* homeDir = getenv("HOME");
if (homeDir == nullptr) if (homeDir == nullptr)
{ {
return GAME_INSTALL_DIRECTORY_PREPROC; return g_executableRoot.string();
} }
else else
{ {
std::filesystem::path homePath = homeDir; std::filesystem::path homePath = homeDir;
std::filesystem::path gamePath = homePath / ".local/share" / USER_DIRECTORY; std::filesystem::path gamePath = homePath / ".local/share" / USER_DIRECTORY;
return gamePath; return gamePath.string();
} }
#else #else
return GAME_INSTALL_DIRECTORY_PREPROC; return ".";
#endif #endif
} }

6
UnleashedRecomp/user/paths.h
View file

@ -4,15 +4,11 @@
#define USER_DIRECTORY "UnleashedRecomp" #define USER_DIRECTORY "UnleashedRecomp"
#ifndef GAME_INSTALL_DIRECTORY_PREPROC
#define GAME_INSTALL_DIRECTORY_PREPROC "."
#endif
bool CheckPortable(); bool CheckPortable();
std::filesystem::path BuildUserPath(); std::filesystem::path BuildUserPath();
const std::filesystem::path& GetUserPath(); const std::filesystem::path& GetUserPath();
extern const std::string g_gamepath; extern const std::string g_gamepath;
std::filesystem::path GetGamePath(); std::string GetGamePath();
inline std::filesystem::path GetSavePath(bool checkForMods) inline std::filesystem::path GetSavePath(bool checkForMods)
{ {

2
flatpak/io.github.hedge_dev.unleashedrecomp.json
View file

@ -20,7 +20,7 @@
"name": "UnleashedRecomp", "name": "UnleashedRecomp",
"buildsystem": "simple", "buildsystem": "simple",
"build-commands": [ "build-commands": [
"cmake --preset linux-release -DUNLEASHED_RECOMP_FLATPAK=ON -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache", "cmake --preset linux-release -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache",
"cmake --build out/build/linux-release --target UnleashedRecomp", "cmake --build out/build/linux-release --target UnleashedRecomp",
"mkdir -p /app/bin", "mkdir -p /app/bin",
"cp out/build/linux-release/UnleashedRecomp/UnleashedRecomp /app/bin/UnleashedRecomp", "cp out/build/linux-release/UnleashedRecomp/UnleashedRecomp /app/bin/UnleashedRecomp",