Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
2 changes: 1 addition & 1 deletion ISSUES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion psxrecomp-v4
Submodule psxrecomp-v4 updated 139 files
4 changes: 2 additions & 2 deletions tools/package_release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
# <exe>/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)?"
Expand Down