Merge branch 'master' into newmk

n64decomp · Apr 17, 2024 · 69b844a · 69b844a
2 parents 6e47922 + 91dcf56
commit 69b844a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/tools/linkonly_generator.py b/tools/linkonly_generator.py
@@ -2,6 +2,7 @@
 
 import re
 import sys
+import io
 
 abbreviations = {
     "banshee_boardwalk":  "BB",
@@ -365,6 +366,6 @@
 
 # Write to files only after we've generated their entire contents. That way if an
 # error occurs during the generation we don't write an incomplete file
-with open(f"courses/{course_name}/course_textures.linkonly.c", "w") as linkonlyc, open(f"courses/{course_name}/course_textures.linkonly.h", "w") as linkonlyh:
+with io.open(f"courses/{course_name}/course_textures.linkonly.c", "w", newline="\n") as linkonlyc, io.open(f"courses/{course_name}/course_textures.linkonly.h", "w", newline="\n") as linkonlyh:
     linkonlyh.write(h_string)
     linkonlyc.write(c_string)
diff --git a/tools/torch b/tools/torch