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
27 changes: 1 addition & 26 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,7 @@ psxrecomp_v4_add_runtime_target(psx-runtime
WINDOW_TITLE "MegaManX5Recomp"
DEFAULT_BIOS_PATH "${PSXRECOMP_V4_ROOT}/bios/SCPH1001.BIN"
DEFAULT_GAME_CONFIG_PATH "game.toml"
)

# 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"
LAUNCHER_BOXART "${CMAKE_SOURCE_DIR}/recomp/launcher/boxart.tga"
)

# First-divergence co-sim oracle build (COSIM_ORACLE.md): clean, deterministic,
Expand All @@ -50,17 +39,3 @@ if(PSX_BUILD_COSIM)
COSIM
)
endif()

# Per-game launcher art override. The framework copies its shared launcher assets
# (img/disc.png etc.) next to the exe; this copies this repo's launcher_art/ on
# top AFTERWARD so the launcher shows MMX5's disc. POST_BUILD commands run in add
# order, and the framework's copy is added inside psxrecomp_v4_add_runtime_target
# above, so this override wins. Drop official art into launcher_art/img/ to replace
# the generated placeholder.
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/launcher_art")
add_custom_command(TARGET psx-runtime POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CMAKE_CURRENT_SOURCE_DIR}/launcher_art"
"$<TARGET_FILE_DIR:psx-runtime>"
COMMENT "Overriding launcher art with MegaManX5Recomp/launcher_art")
endif()
Binary file removed launcher_art/img/disc.png
Binary file not shown.
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 @@ -43,7 +43,7 @@ Invoke-Native { cmake --build $RecompDir --target psxrecomp-game -j $env:NUMBER_
& (Join-Path $RecompDir "psxrecomp-game.exe") --config (Join-Path $Root "game.toml")
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 @@ -67,7 +67,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
2 changes: 1 addition & 1 deletion tools/run_mmx5.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Usage: powershell -File tools\run_mmx5.ps1 [-BuildDir build-master]
param(
[string]$BuildDir = "build-master",
[switch]$NoLauncher # boot straight into the game (skip the RmlUi launcher) for scripted/debug runs
[switch]$NoLauncher # boot straight into the game for scripted/debug runs
)
$ErrorActionPreference = "Stop"
$root = Split-Path -Parent $PSScriptRoot
Expand Down