diff --git a/CMakeLists.txt b/CMakeLists.txt index 77fabf937c..7144f5128b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,7 +344,7 @@ set(GAME_LIBS aurora::core aurora::gx aurora::gd aurora::si aurora::vi aurora::p aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt Threads::Threads) -list(APPEND GAME_LIBS libzstd_static) +list(APPEND GAME_LIBS zstd::libzstd) if (DUSK_ENABLE_SENTRY_NATIVE) list(APPEND GAME_LIBS sentry) diff --git a/CMakePresets.json b/CMakePresets.json index 6c02a06a26..d83ed045aa 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -335,6 +335,14 @@ "type": "BOOL", "value": false }, + "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": { + "type": "BOOL", + "value": true + }, + "CMAKE_DISABLE_FIND_PACKAGE_zstd": { + "type": "BOOL", + "value": true + }, "AURORA_SDL3_VERSION": "3.4.8", "AURORA_SDL3_REF": "refs/tags/release-3.4.8" } diff --git a/extern/aurora b/extern/aurora index 839af55c15..49e61d7dad 160000 --- a/extern/aurora +++ b/extern/aurora @@ -1 +1 @@ -Subproject commit 839af55c1588a5c4be5c178c0bb30cfd0a0e4385 +Subproject commit 49e61d7dadfd0b59ba716a9f503225e0d46f707e diff --git a/flake.nix b/flake.nix index 0a2156a4d5..713acef074 100644 --- a/flake.nix +++ b/flake.nix @@ -57,12 +57,22 @@ inherit (pkgs.stdenv.hostPlatform) isDarwin; hasNodPrebuilt = nodPrebuiltInfo ? ${system}; - aurora = pkgs.fetchFromGitHub { - owner = "encounter"; - repo = "aurora"; - rev = "10006618ee493f248b8597e4dfa1d2871d76a1d9"; - hash = "sha256-lY2xuVyB7aPJ9+2wwLRB3F5U/BuPSxdSpegdG+qNd9o="; - }; + aurora = builtins.pathExists "${self}/extern/aurora/CMakeLists.txt"; + needSubmodules = '' + dusklight: The aurora submodule is not vendored. Add submodules=1 to build. + + As a flake input: + + dusklight.url = "git+https://github.com/TwilitRealm/dusklight?ref=main&submodules=1"; + + nix command: + + nix run 'git+https://github.com/TwilitRealm/dusklight?submodules=1' + + Local checkout: + + nix run '.?submodules=1#dusklight' + ''; dawn = pkgs.fetchzip { url = "https://github.com/encounter/dawn-build/releases/download/${dawnVersion}/dawn-${dawnInfo.${system}.triple}.tar.gz"; @@ -153,119 +163,120 @@ }; }; - dusklight = pkgs.stdenv.mkDerivation { - pname = "dusklight"; - version = versionSuffix; - src = ./.; + dusklight = + if !aurora then + throw needSubmodules + else + pkgs.stdenv.mkDerivation { + pname = "dusklight"; + version = versionSuffix; + src = ./.; - postUnpack = '' - chmod -R u+w "$sourceRoot" - rm -rf "$sourceRoot/extern/aurora" - mkdir -p "$sourceRoot/extern" - cp -r ${aurora} "$sourceRoot/extern/aurora" - chmod -R u+w "$sourceRoot/extern/aurora" - substituteInPlace "$sourceRoot/extern/aurora/CMakeLists.txt" \ - --replace-warn "add_subdirectory(tests)" "" - ''; - - nativeBuildInputs = [ - pkgs.cmake - pkgs.ninja - pkgs.pkg-config - pkgs.python3 - pkgs.python3Packages.markupsafe - ] - ++ lib.optionals (!isDarwin) [ pkgs.autoPatchelfHook ]; - - buildInputs = [ - pkgs.sdl3 - pkgs.freetype - pkgs.zstd - pkgs.cxxopts - pkgs.nlohmann_json - pkgs.xxHash - pkgs.abseil-cpp - pkgs.zlib - pkgs.libpng - pkgs.libjpeg_turbo - pkgs.curl - pkgs.openssl - ] - ++ lib.optionals isDarwin [ - pkgs.apple-sdk_15 - pkgs.libiconv - ] - ++ lib.optionals (!isDarwin) [ - pkgs.libGL - pkgs.libGLU - pkgs.libglvnd - pkgs.vulkan-loader - pkgs.libX11 - pkgs.libxcb - pkgs.libXcursor - pkgs.libxi - pkgs.libxrandr - pkgs.libxscrnsaver - pkgs.libxtst - pkgs.libxinerama - pkgs.libxkbcommon - pkgs.wayland - pkgs.libdecor - pkgs.alsa-lib - pkgs.libpulseaudio - pkgs.pipewire - pkgs.dbus - pkgs.udev - pkgs.libusb1 - pkgs.libunwind - pkgs.gtk3 - ]; - - cmakeBuildType = "RelWithDebInfo"; - ninjaFlags = [ "dusklight" ]; - - cmakeFlags = [ - "-DDUSK_VERSION_OVERRIDE=${versionSuffix}" - "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" - "-DAURORA_DAWN_PROVIDER=package" - "-DAURORA_DAWN_LINKAGE=static" - "-DAURORA_NOD_PROVIDER=package" - "-DAURORA_NOD_LINKAGE=static" - "-DAURORA_SDL3_PROVIDER=system" - ] - ++ lib.mapAttrsToList (key: src: "-DFETCHCONTENT_SOURCE_DIR_${key}=${src}") fetchContentDirs; - - installPhase = - if isDarwin then - '' - runHook preInstall - mkdir -p "$out/Applications" - cp -r Dusklight.app "$out/Applications/Dusklight.app" - runHook postInstall - '' - else - '' - runHook preInstall - install -Dm755 dusklight "$out/bin/dusklight" - cp -r "$src/res" "$out/bin/res" - install -Dm644 "$src/platforms/freedesktop/dev.twilitrealm.dusk.desktop" \ - "$out/share/applications/dev.twilitrealm.dusk.desktop" - for size in 16 32 48 64 128 256 512 1024; do - install -Dm644 "$src/platforms/freedesktop/''${size}x''${size}/apps/dev.twilitrealm.dusk.png" \ - "$out/share/icons/hicolor/''${size}x''${size}/apps/dev.twilitrealm.dusk.png" - done - runHook postInstall + postUnpack = '' + chmod -R u+w "$sourceRoot" + substituteInPlace "$sourceRoot/extern/aurora/CMakeLists.txt" \ + --replace-warn "add_subdirectory(tests)" "" ''; - dontStrip = true; + nativeBuildInputs = [ + pkgs.cmake + pkgs.ninja + pkgs.pkg-config + pkgs.python3 + pkgs.python3Packages.markupsafe + ] + ++ lib.optionals (!isDarwin) [ pkgs.autoPatchelfHook ]; - meta = { - description = "Dusklight — native PC port of the Twilight Princess decompilation"; - homepage = "https://github.com/zeldaret/tp"; - platforms = supportedSystems; - mainProgram = "dusklight"; - }; - }; + buildInputs = [ + pkgs.sdl3 + pkgs.freetype + pkgs.zstd + pkgs.cxxopts + pkgs.nlohmann_json + pkgs.xxHash + pkgs.abseil-cpp + pkgs.zlib + pkgs.libpng + pkgs.libjpeg_turbo + pkgs.curl + pkgs.openssl + ] + ++ lib.optionals isDarwin [ + pkgs.apple-sdk_15 + pkgs.libiconv + ] + ++ lib.optionals (!isDarwin) [ + pkgs.libGL + pkgs.libGLU + pkgs.libglvnd + pkgs.vulkan-loader + pkgs.libX11 + pkgs.libxcb + pkgs.libXcursor + pkgs.libxi + pkgs.libxrandr + pkgs.libxscrnsaver + pkgs.libxtst + pkgs.libxinerama + pkgs.libxkbcommon + pkgs.wayland + pkgs.libdecor + pkgs.alsa-lib + pkgs.libpulseaudio + pkgs.pipewire + pkgs.dbus + pkgs.udev + pkgs.libusb1 + pkgs.libunwind + pkgs.gtk3 + ]; + + cmakeBuildType = "RelWithDebInfo"; + ninjaFlags = [ "dusklight" ]; + + cmakeFlags = [ + "-DDUSK_VERSION_OVERRIDE=${versionSuffix}" + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + "-DAURORA_DAWN_PROVIDER=package" + "-DAURORA_DAWN_LINKAGE=static" + "-DAURORA_NOD_PROVIDER=package" + "-DAURORA_NOD_LINKAGE=static" + "-DAURORA_SDL3_PROVIDER=system" + "-DBUILD_SHARED_LIBS=OFF" + ] + ++ lib.mapAttrsToList (key: src: "-DFETCHCONTENT_SOURCE_DIR_${key}=${src}") fetchContentDirs; + + installPhase = + if isDarwin then + '' + runHook preInstall + mkdir -p "$out/Applications" + cp -r Dusklight.app "$out/Applications/Dusklight.app" + runHook postInstall + '' + else + '' + runHook preInstall + install -Dm755 dusklight "$out/bin/dusklight" + cp -r "$src/res" "$out/bin/res" + install -Dm644 "$src/platforms/freedesktop/dev.twilitrealm.dusk.desktop" \ + "$out/share/applications/dev.twilitrealm.dusk.desktop" + for size in 16 32 48 64 128 256 512 1024; do + install -Dm644 "$src/platforms/freedesktop/''${size}x''${size}/apps/dev.twilitrealm.dusk.png" \ + "$out/share/icons/hicolor/''${size}x''${size}/apps/dev.twilitrealm.dusk.png" + done + runHook postInstall + ''; + + dontStrip = true; + + meta = { + description = "Dusklight — native PC port of the Twilight Princess decompilation"; + homepage = "https://github.com/zeldaret/tp"; + platforms = supportedSystems; + mainProgram = "dusklight"; + }; + }; # Tooling common to every supported host (Linux and macOS). commonDevTools = [ diff --git a/platforms/freedesktop/dev.twilitrealm.dusk.metainfo.xml b/platforms/freedesktop/dev.twilitrealm.dusk.metainfo.xml new file mode 100644 index 0000000000..ac99f15ddc --- /dev/null +++ b/platforms/freedesktop/dev.twilitrealm.dusk.metainfo.xml @@ -0,0 +1,38 @@ + + + dev.twilitrealm.dusk + dev.twilitrealm.dusk.desktop + Dusklight + Native port of a classic adventure game + + Twilit Realm + + https://twilitrealm.dev + https://github.com/TwilitRealm/dusklight/issues + CC0-1.0 + CC0-1.0 + + + console + gamepad + + +

+ Dusklight is a reverse-engineered reimplementation of a classic adventure game. + It aims to be as accurate as possible to the original while also providing new options, enhancements, and tools to customize your experience. +

+ + + + dusklight + dev.twilitrealm.dusk.desktop + + + + + +

Initial Flatpak release.

+ + + + diff --git a/src/dusk/data.cpp b/src/dusk/data.cpp index dc666dd236..2720651699 100644 --- a/src/dusk/data.cpp +++ b/src/dusk/data.cpp @@ -111,7 +111,7 @@ std::filesystem::path get_pref_path() { Log.fatal("Unable to get PrefPath: {}", SDL_GetError()); } - std::filesystem::path result{reinterpret_cast(prefPath)}; + std::filesystem::path result = path_from_utf8(prefPath); SDL_free(prefPath); return result; } @@ -128,7 +128,7 @@ std::filesystem::path base_path_relative(const std::filesystem::path& path) { if (!basePath) { return path; } - return std::filesystem::path{basePath} / path; + return path_from_utf8(basePath) / path; } std::filesystem::path default_data_path(const std::filesystem::path& prefPath) {