++

van800 · Mar 3, 2025 · f8a4d41 · f8a4d41
1 parent a55ce71
commit f8a4d41
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git 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 = " ^&amp; ".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 = " ^&amp; ".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 = " ^&amp; ".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(
@@ -1570,5 +1570,5 @@ def get_default_include_paths(env):
     output = ret.stdout
     match = re.search(r"#include <\.\.\.> search starts here:([\S\s]*)End of search list.", output)
     if not match:
-        return [] #msvc case
+        return []  # msvc case
     return [x.strip() for x in match[1].strip().splitlines()]
diff --git a/platform/linuxbsd/msvs.py b/platform/linuxbsd/msvs.py
@@ -8,6 +8,4 @@ def get_configurations():
 
 
 def get_build_prefix(env):
-    return [
-        "echo Starting SCons &amp;"
-    ]
+    return ["echo Starting SCons &amp;"]
diff --git a/platform/macos/msvs.py b/platform/macos/msvs.py
@@ -9,6 +9,4 @@ def get_configurations():
 
 # results are not needed on Mac and Linux
 def get_build_prefix(env):
-    return [
-        "echo Starting SCons &amp;"
-    ]
+    return ["echo Starting SCons &amp;"]
diff --git 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 &amp;"]
+    batch_file = methods.find_visual_c_batch_file(env)
     return [
         "echo Starting SCons &amp;&amp; cmd /V /C",
-        "set &quot;plat=$(PlatformTarget)&quot;",
-        "(if &quot;$(PlatformTarget)&quot;==&quot;x64&quot; (set &quot;plat=x86_amd64&quot;))",
-        f"call &quot;{batch_file}&quot; !plat!",
+        "^&amp; set &quot;plat=$(PlatformTarget)&quot;",
+        "^&amp; (if &quot;$(PlatformTarget)&quot;==&quot;x64&quot; (set &quot;plat=x86_amd64&quot;))",
+        f"^&amp; call &quot;{batch_file}&quot; !plat!",
     ]