diff --git a/CMakeLists.txt b/CMakeLists.txt index d5f1666..3b150b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,21 +32,10 @@ psxrecomp_v4_add_runtime_target(psx-runtime WINDOW_TITLE "MegaManX4Recomp" DEFAULT_BIOS_PATH "${PSXRECOMP_V4_ROOT}/bios/SCPH1001.BIN" DEFAULT_GAME_CONFIG_PATH "game.toml" + 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 @@ -63,17 +52,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 MMX4'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" - "$" - COMMENT "Overriding launcher art with MegaManX4Recomp/launcher_art") -endif() diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 16f4c25..6e4f66c 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -85,7 +85,7 @@ the recompiled PS1 BIOS. # Mega Man X4 Recompiled — v0.0.3-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. BIOS/disc selection, settings, controls, memory cards, and the Launch button now use the DPI-independent shared layout, addressing the inaccessible/broken launcher reported in issue #3. diff --git a/launcher_art/img/disc.png b/launcher_art/img/disc.png deleted file mode 100644 index 36df3ba..0000000 Binary files a/launcher_art/img/disc.png and /dev/null differ 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 4d00d21..44f549c 160000 --- a/recomp-ui +++ b/recomp-ui @@ -1 +1 @@ -Subproject commit 4d00d217977fb19c7135f1cba848ad345a89d462 +Subproject commit 44f549c0f159df343cba9d8c3842dbc7e592eb08 diff --git a/tools/package_release.ps1 b/tools/package_release.ps1 index 1216d61..6ce307c 100644 --- a/tools/package_release.ps1 +++ b/tools/package_release.ps1 @@ -53,7 +53,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 -DPSXRECOMP_ROOT="$FrameworkRoot" } "cmake configure" +Invoke-Native { cmake -S $Root -B $BuildPath -G Ninja -DCMAKE_BUILD_TYPE=Release -DPSX_DEBUG_TOOLS=OFF -DPSXRECOMP_ROOT="$FrameworkRoot" } "cmake configure" Invoke-Native { cmake --build $BuildPath -j $env:NUMBER_OF_PROCESSORS } "cmake build" if (Test-Path $StageRoot) { @@ -77,7 +77,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)?" diff --git a/tools/run_mmx4.ps1 b/tools/run_mmx4.ps1 index d2c55e3..2129de4 100644 --- a/tools/run_mmx4.ps1 +++ b/tools/run_mmx4.ps1 @@ -6,7 +6,7 @@ # Usage: powershell -File tools\run_mmx4.ps1 [-BuildDir build-master] [-NoLauncher] 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\MegaManX4Recomp"