minor fixes for windows

charlesneimog · Sep 7, 2023 · 2af594b · 2af594b
1 parent 6cb0719
commit 2af594b
Showing 1 changed file with 38 additions and 29 deletions.
diff --git a/pd2wasm/PdWebCompiler.py b/pd2wasm/PdWebCompiler.py
@@ -772,7 +772,10 @@ def emccCompile(self):
         self.libpd_dir = self.PdWebCompilearPath + '/libpd'
         self.src_files = 'webpatch/main.c'
         memory = 32 # we start with 32mb, for big patches you should increase this value
-        emcc = self.PdWebCompilearPath + '/emsdk/upstream/emscripten/emcc'
+        if platform.system() == "Windows":
+            emcc = '"' + self.PdWebCompilearPath + '\\emsdk\\upstream\\emscripten\\emcc"'
+        else:
+            emcc = self.PdWebCompilearPath + '/emsdk/upstream/emscripten/emcc'
 
         command = [emcc,
                    "-I", "webpatch/includes/",
@@ -808,35 +811,41 @@ def emccCompile(self):
         print("")
         self.print("    " + " ".join(command), color='blue')
         print("")
-        process = subprocess.Popen(
-            command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
-        _, stderr = process.communicate()
-        if stderr:
-            if "warning" in stderr:
-                # split by new line
-                stderr = stderr.split("\n")
-                for line in stderr:
-                    if "warning:" in line:
-                        print("")
-                        self.print("     " + line, color='yellow')
-                        print("")
-                    else:
-                        print("     " + line)
-            if "error" in stderr:
-                stderr = stderr.split("\n")
-                for line in stderr:
-                    if "error:" in line:
-                        print("")
-                        self.print("    " + line, color='red')
-                        print("")
-                        sys.exit(-1)
-                    else:
-                        self.print(line, color='red')
-            else:
-                self.print("    " + ("=" * 10) +
-                      " Compiled with success " + ("=" * 10), color='green')
+
+        if platform.system() == "Windows":
+            os.system(" ".join(command))
+
+
+        else:
+            process = subprocess.Popen(
+                command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
+            _, stderr = process.communicate()
+            if stderr:
+                if "warning" in stderr:
+                    # split by new line
+                    stderr = stderr.split("\n")
+                    for line in stderr:
+                        if "warning:" in line:
+                            print("")
+                            self.print("     " + line, color='yellow')
+                            print("")
+                        else:
+                            print("     " + line)
+                if "error" in stderr:
+                    stderr = stderr.split("\n")
+                    for line in stderr:
+                        if "error:" in line:
+                            print("")
+                            self.print("    " + line, color='red')
+                            print("")
+                            sys.exit(-1)
+                        else:
+                            self.print(line, color='red')
+                else:
+                    self.print("    " + ("=" * 10) +
+                        " Compiled with success " + ("=" * 10), color='green')
 
-        process.wait()
+            process.wait()
         if isinstance(self.html, str):
             shutil.copy(self.html, "webpatch")