fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Test Pyodide builds

Author: HexDecimal

build_libtcod.py

@@ -207,12 +207,12 @@ def walk_sources(directory: str) -> Iterator[str]:
     ],
 }
 
-if sys.platform == "win32" and "--compiler=mingw32" not in sys.argv:
-    extra_compile_args.extend(MSVC_CFLAGS[tdl_build])
-    extra_link_args.extend(MSVC_LDFLAGS[tdl_build])
-else:
-    extra_compile_args.extend(GCC_CFLAGS[tdl_build])
-    extra_link_args.extend(GCC_CFLAGS[tdl_build])
+# if sys.platform == "win32" and "--compiler=mingw32" not in sys.argv:
+#    extra_compile_args.extend(MSVC_CFLAGS[tdl_build])
+#    extra_link_args.extend(MSVC_LDFLAGS[tdl_build])
+# else:
+#    extra_compile_args.extend(GCC_CFLAGS[tdl_build])
+#    extra_link_args.extend(GCC_CFLAGS[tdl_build])
 
 ffi = FFI()
 sdl_cdef, sdl_strings = build_sdl.get_cdef()

build_sdl.py

@@ -393,7 +393,7 @@ def get_cdef() -> tuple[str, dict[str, str]]:
         sdl_cdef = sdl_cdef.replace(f"}} {name};", f"...;}} {name};")
 
     # Remove variable arg functions
-    RE_VA_ARG_FUNC = re.compile(r"^.*?\([^()]*\.\.\.*\)\s*;\s*$", re.MULTILINE)
+    RE_VA_ARG_FUNC = re.compile(r"^.*?\([^()]*\.\.\.\)\s*;\s*$", re.MULTILINE)
     sdl_cdef = RE_VA_ARG_FUNC.sub("", sdl_cdef)
 
     return sdl_cdef + EXTRA_CDEF, parser.known_string_defines