diff --git a/methods.py b/methods.py index 7f896a5a1e0..2d71a9ff052 100644 --- a/methods.py +++ b/methods.py @@ -1275,13 +1275,13 @@ def get_dependencies(file, env, exts, headers, sources, others): else: common_build_prefix[0] = common_build_prefix[0] - cmd = " ^& ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)]) + cmd = " ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)]) props_template = props_template.replace("%%BUILD%%", cmd) - cmd = " ^& ".join(common_build_prefix + [" ".join([commands] + cmd_rebuild)]) + cmd = " ".join(common_build_prefix + [" ".join([commands] + cmd_rebuild)]) props_template = props_template.replace("%%REBUILD%%", cmd) - cmd = " ^& ".join(common_build_prefix + [" ".join([commands] + cmd_clean)]) + cmd = " ".join(common_build_prefix + [" ".join([commands] + cmd_clean)]) props_template = props_template.replace("%%CLEAN%%", cmd) with open( diff --git a/platform/windows/msvs.py b/platform/windows/msvs.py index c5ccea66020..725d431907f 100644 --- a/platform/windows/msvs.py +++ b/platform/windows/msvs.py @@ -12,12 +12,12 @@ def get_configurations(): def get_build_prefix(env): - batch_file = methods.find_visual_c_batch_file(env) if not env.msvc: return ["echo Starting SCons &"] + batch_file = methods.find_visual_c_batch_file(env) return [ "echo Starting SCons && cmd /V /C", - "set "plat=$(PlatformTarget)"", - "(if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64"))", - f"call "{batch_file}" !plat!", + "^& set "plat=$(PlatformTarget)"", + "^& (if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64"))", + f"^& call "{batch_file}" !plat!", ]