Merge branch 'friction-1.0' into friction

friction2d · Dec 22, 2024 · d375e53 · d375e53
2 parents 1a281bf + f6e5f9e
commit d375e53
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/bin/gn.bin b/bin/gn.bin
diff --git a/gn/find_xcode_sysroot.py b/gn/find_xcode_sysroot.py
@@ -12,4 +12,5 @@
 
 (sdk,) = sys.argv[1:]
 
-print(subprocess.check_output(['xcrun', '--sdk', sdk, '--show-sdk-path']))
+print(subprocess.check_output([
+    'xcrun', '--sdk', sdk, '--show-sdk-path']).decode('utf-8'))
diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn
@@ -198,7 +198,7 @@ toolchain("msvc") {
 
   tool("copy") {
     cp_py = rebase_path("../cp.py")
-    command = "python \"$cp_py\" {{source}} {{output}}"
+    command = "python3 \"$cp_py\" {{source}} {{output}}"
     description = "copy {{source}} {{output}}"
   }
 }
@@ -337,13 +337,13 @@ template("gcc_like_toolchain") {
 
     tool("copy") {
       cp_py = rebase_path("../cp.py")
-      command = "python \"$cp_py\" {{source}} {{output}}"
+      command = "python3 \"$cp_py\" {{source}} {{output}}"
       description = "copy {{source}} {{output}}"
     }
 
     tool("copy_bundle_data") {
       cp_py = rebase_path("../cp.py")
-      command = "python \"$cp_py\" {{source}} {{output}}"
+      command = "python3 \"$cp_py\" {{source}} {{output}}"
       description = "copy_bundle_data {{source}} {{output}}"
     }