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 @@ -41,21 +41,10 @@ psxrecomp_v4_add_runtime_target(psx-runtime
DEFAULT_BIOS_PATH "${PSXRECOMP_V4_ROOT}/bios/SCPH1001.BIN"
DEFAULT_GAME_CONFIG_PATH "game.toml"
EXE_NAME "mmx6-runtime"
LAUNCHER_BOXART "${CMAKE_SOURCE_DIR}/recomp/launcher/boxart.tga"
EXTRAS_SOURCES ${GAME_GENERATED_EXTRAS}
)

# 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"
)

# First-divergence co-sim oracle build (COSIM_ORACLE.md): clean, deterministic,
# PSX_NO_DEBUG_TOOLS + PSX_COSIM. Two of these (one normal, one PSX_FORCE_INTERP=1)
# are cycle-lockstepped by tools/cosim.py to find the exact first compiled-vs-interp
Expand All @@ -72,17 +61,3 @@ if(PSX_BUILD_COSIM)
COSIM
)
endif()

# Per-game launcher art override. The framework copies its shared launcher assets
# (img/disc.png etc. — the default is Tomba's disc) next to the exe; this copies
# this repo's launcher_art/ on top AFTERWARD so the launcher shows MMX6'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 MegaManX6Recomp/launcher_art")
endif()
4 changes: 2 additions & 2 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ required) and broader controller support.

# Mega Man X6 Recompiled — v0.0.6-alpha

This release replaces the old RmlUi launcher with the shared Dear ImGui
This release replaces the old in-tree launcher with the shared Dear ImGui
`recomp-ui` launcher. Its DPI-independent layout keeps launcher text, settings,
and the Launch button readable and reachable on Steam Deck and high-resolution
or scaled Windows displays, addressing issues #1 and #3.
Expand All @@ -87,6 +87,6 @@ or scaled Windows displays, addressing issues #1 and #3.
- Bundles the matching launcher fonts and game-specific art beside the
executable.
- Keeps the complete settings surface accessible without relying on the old
fixed-size RmlUi document layout.
fixed-size legacy document layout.

All existing alpha caveats and game-compatibility notes above still apply.
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 @@ -45,7 +45,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_mmx6.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Usage: powershell -File tools\run_mmx6.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 = "F:\Projects\psxrecomp\MegaManX6Recomp"
Expand Down