diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dd3584..c096ff8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,19 +57,8 @@ psxrecomp_add_runtime_target(psx-runtime # "bios/SCPH1001.BIN"). Dev trees resolve it via the exe-dir upward search # (psxrecomp-v4/bios); user installs use bios.cfg / the picker. DEFAULT_GAME_CONFIG_PATH "game.toml" + LAUNCHER_BOXART "${CMAKE_SOURCE_DIR}/recomp/launcher/boxart.tga" ) # Distinct process name (see comment above). set_target_properties(psx-runtime PROPERTIES OUTPUT_NAME "${_tomba2_exe_name}") - -# Shared recomp-ui Dear ImGui launcher. Wires in the PSX-themed launcher UI -# (see main.cpp RECOMP_LAUNCHER gate) instead of the framework's default RmlUi -# launcher. recomp-ui is a real git submodule (github.com/mstan/recomp-ui, -# pinned via the recomp-ui gitlink); locally it is a directory junction to the -# working checkout so builds stay offline and reproducible like everything else. -include("${CMAKE_SOURCE_DIR}/recomp-ui/recomp_ui.cmake") -recomp_target_launcher_ui(psx-runtime - BOXART "${CMAKE_SOURCE_DIR}/recomp/launcher/boxart.tga" - PAD "${CMAKE_SOURCE_DIR}/recomp/launcher/pad.tga" - BRAND "${CMAKE_SOURCE_DIR}/recomp/launcher/brand.tga" -) diff --git a/ISSUES.md b/ISSUES.md index 23bb38a..63721d5 100644 --- a/ISSUES.md +++ b/ISSUES.md @@ -35,7 +35,7 @@ most recent completed display images at the host refresh rate while the guest, audio, and input continue at their original cadence. It adds one source-frame of display latency but does not accelerate game logic. Set `frame_interpolation = false` under `[video]`, or set -`PSX_FRAME_INTERPOLATION=0`, to disable it. The RmlUi launcher exposes both the +`PSX_FRAME_INTERPOLATION=0`, to disable it. The launcher exposes both the toggle and a presentation target (display refresh, 90, 120, 144, 165, or 240 FPS); the equivalent config key is `frame_interpolation_fps` and `0` means the current display refresh. diff --git a/README.md b/README.md index 46848d7..0c1976a 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ build/boot bring-up in progress. cmake -S . -B build-master -G Ninja -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=C:/msys64/mingw64/bin/gcc.exe \ -DCMAKE_CXX_COMPILER=C:/msys64/mingw64/bin/g++.exe \ - -DPSX_DEBUG_TOOLS=ON -DPSX_LAUNCHER=OFF + -DPSX_DEBUG_TOOLS=ON cmake --build build-master --target psx-runtime -j 16 ``` diff --git a/psxrecomp-v4 b/psxrecomp-v4 index 647b817..f86087a 160000 --- a/psxrecomp-v4 +++ b/psxrecomp-v4 @@ -1 +1 @@ -Subproject commit 647b81752ffd83a88e541ace90cf692bb461f17a +Subproject commit f86087ad94e53fba5ec0bb146ae94f789c60803a diff --git a/recomp-ui b/recomp-ui index 1cc70df..44f549c 160000 --- a/recomp-ui +++ b/recomp-ui @@ -1 +1 @@ -Subproject commit 1cc70dfa66506b8fe332a3ef4422e61d642b633b +Subproject commit 44f549c0f159df343cba9d8c3842dbc7e592eb08 diff --git a/tools/package_release.ps1 b/tools/package_release.ps1 index 8586e20..534b11e 100644 --- a/tools/package_release.ps1 +++ b/tools/package_release.ps1 @@ -45,7 +45,7 @@ if ($SkipRegen) { if ($LASTEXITCODE -ne 0) { throw "game regen failed" } } -Invoke-Native { cmake -S $Root -B $BuildPath -G Ninja -DCMAKE_BUILD_TYPE=Release -DPSX_DEBUG_TOOLS=OFF -DPSX_LAUNCHER=ON } "cmake configure" +Invoke-Native { cmake -S $Root -B $BuildPath -G Ninja -DCMAKE_BUILD_TYPE=Release -DPSX_DEBUG_TOOLS=OFF } "cmake configure" Invoke-Native { cmake --build $BuildPath -j $env:NUMBER_OF_PROCESSORS } "cmake build" if (Test-Path $StageRoot) { @@ -66,7 +66,7 @@ if (Test-Path (Join-Path $Root "RELEASE_NOTES.md")) { # Launcher assets: this build ships the shared recomp-ui Dear ImGui launcher # (RECOMP_LAUNCHER; see main.cpp + recomp-ui/recomp_ui.cmake), which loads from # /assets/ (fonts + img TGAs, including this repo's boxart baked in by -# recomp_target_launcher_ui's POST_BUILD) -- NOT the legacy RmlUi launcher.rml. +# recomp_target_launcher_ui's POST_BUILD). $AssetsSrc = Join-Path $BuildPath "assets" if (-not (Test-Path (Join-Path $AssetsSrc "img"))) { throw "recomp-ui launcher assets missing at $AssetsSrc -- was the recomp-ui launcher built (recomp-ui junction present)?"