From b8d1dbc502ebe338e863fdd6c415f02a7165f93c Mon Sep 17 00:00:00 2001 From: Matthew Stanley <1379tech@gmail.com> Date: Thu, 1 Oct 2026 10:52:46 -0700 Subject: [PATCH] cli: let --cmake-extra override rebuild's forced PSX_DEBUG_TOOLS=OFF Co-Authored-By: Claude Opus 5.5 (1M context) --- psxrecomp_cli.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/psxrecomp_cli.py b/psxrecomp_cli.py index 0f48fece..b148a05c 100755 --- a/psxrecomp_cli.py +++ b/psxrecomp_cli.py @@ -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)