mirror of
https://github.com/RetroPortingToolKit/psxrecomp
synced 2026-10-26 02:11:36 -04:00
cli: let --cmake-extra override rebuild's forced PSX_DEBUG_TOOLS=OFF
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
+4
-5
@@ -2047,8 +2047,7 @@ def cmd_rebuild(args: argparse.Namespace, progress: ProgressReporter) -> int:
|
||||
"-DPSXRECOMP_ALLOW_NO_BIOS=OFF",
|
||||
"-DPSXRECOMP_REQUIRE_GAME_C=ON",
|
||||
]
|
||||
if args.cmake_extra:
|
||||
cmake_extra.extend(args.cmake_extra)
|
||||
user_extra = list(args.cmake_extra or [])
|
||||
|
||||
clamped = clamp_future_mtimes(project_root, skip=build_dir)
|
||||
if clamped:
|
||||
@@ -2078,7 +2077,7 @@ def cmd_rebuild(args: argparse.Namespace, progress: ProgressReporter) -> int:
|
||||
if not pgo_enabled:
|
||||
progress.phase("build", pct=0.2, message="cmake Release build...")
|
||||
_cmake_configure(
|
||||
project_root, build_dir, pgo="", extra=cmake_extra + ["-DPSX_DEBUG_TOOLS=OFF"], progress=progress
|
||||
project_root, build_dir, pgo="", extra=cmake_extra + ["-DPSX_DEBUG_TOOLS=OFF"] + user_extra, progress=progress
|
||||
)
|
||||
_cmake_build(build_dir, target, progress)
|
||||
else:
|
||||
@@ -2098,7 +2097,7 @@ def cmd_rebuild(args: argparse.Namespace, progress: ProgressReporter) -> int:
|
||||
project_root,
|
||||
build_dir,
|
||||
pgo="generate",
|
||||
extra=cmake_extra + ["-DPSX_DEBUG_TOOLS=ON"],
|
||||
extra=cmake_extra + user_extra + ["-DPSX_DEBUG_TOOLS=ON"],
|
||||
progress=progress,
|
||||
)
|
||||
_cmake_build(build_dir, target, progress)
|
||||
@@ -2125,7 +2124,7 @@ def cmd_rebuild(args: argparse.Namespace, progress: ProgressReporter) -> int:
|
||||
project_root,
|
||||
build_dir,
|
||||
pgo="use",
|
||||
extra=cmake_extra + ["-DPSX_DEBUG_TOOLS=OFF"],
|
||||
extra=cmake_extra + ["-DPSX_DEBUG_TOOLS=OFF"] + user_extra,
|
||||
progress=progress,
|
||||
)
|
||||
_cmake_build(build_dir, target, progress)
|
||||
|
||||
Reference in New Issue
Block a user