Rename emscripten target to wasm, and don't build jsprime for general…

… distribution
haxenme · Sep 16, 2024 · 6311d36 · 6311d36
1 parent a244f7d
commit 6311d36
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 24 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -66,16 +66,6 @@ jobs:
            cd acadnme
            haxelib run nme cpp build -DHXCPP_M64
            
-      - name: Setup Emscripten
-        if: startsWith(matrix.os,'ubuntu')
-        uses: mymindstorm/setup-emsdk@v11
-
-      - name: Build JSPRIME
-        if: startsWith(matrix.os,'ubuntu')
-        run: |
-          cd project
-          neko build.n jsprime
-
       - name: Clean Project
         if: startsWith(matrix.os,'ubuntu')
         run: |
@@ -90,13 +80,6 @@ jobs:
           path: |
              ndll/Linux64/nme.ndll
              bin/Linux/Acadnme
-             ndll/Emscripten/nme.wasm
-             ndll/Emscripten/nme.js
-             ndll/Emscripten/nme.js.mem
-             ndll/Emscripten/NmeClasses.js
-             ndll/Emscripten/preloader.js
-             ndll/Emscripten/parsenme.js
-             ndll/Emscripten/export_classes.info
              src/cppia/export_classes.info
              version.env
              tools

diff --git a/tools/nme/src/CommandLineTools.hx b/tools/nme/src/CommandLineTools.hx
@@ -58,7 +58,7 @@ class CommandLineTools
             "androidview", "android-view", "iphonesim", "android", "androidsim", "rpi",
             "windows", "mac", "linux", "flash", "cppia", "emscripten", "html5",
             "watchsimulator", "watchos", "jsprime", "winrt", "uwp", "rg350",
-            "bundlerelease", "bundledebug", "arm64" ];
+            "bundlerelease", "bundledebug", "arm64", "wasm" ];
    static var allCommands = 
           [ "help", "setup", "document", "generate", "create", "xcode", "clone", "demo",
              "installer", "copy-if-newer", "tidy", "set", "unset", "nocompile",
@@ -137,7 +137,7 @@ class CommandLineTools
             if (jsPlatform!=null)
                jsPlatform.copyOutputTo(platform.getOutputDir());
 
-         case Platform.EMSCRIPTEN:
+         case Platform.EMSCRIPTEN, Platform.WASM:
             platform = new platforms.EmscriptenPlatform(project);
 
          case Platform.JS:

diff --git a/tools/nme/src/platforms/EmscriptenPlatform.hx b/tools/nme/src/platforms/EmscriptenPlatform.hx
@@ -42,8 +42,8 @@ class EmscriptenPlatform extends DesktopPlatform
          project.haxeflags.push('-D HXCPP_LINK_MEM_FILE=1');
    }
 
-   override public function getPlatformDir() : String { return "emscripten"; }
-   override public function getBinName() : String { return "Emscripten"; }
+   override public function getPlatformDir() : String { return "wasm"; }
+   override public function getBinName() : String { return "Wasm"; }
    override public function getNativeDllExt() { return ".js"; }
    override public function getLibExt() { return ".a"; }
 

diff --git a/tools/nme/src/platforms/Platform.hx b/tools/nme/src/platforms/Platform.hx
@@ -30,6 +30,7 @@ class Platform
    public static inline var WATCH = "WATCH";
    public static inline var JSPRIME = "JSPRIME"; // Alias for HTML5
    public static inline var RG350 = "RG350";
+   public static inline var WASM = "wasm";
 
 
    public static inline var TYPE_WEB = "WEB";

diff --git a/tools/nme/src/project/NMEProject.hx b/tools/nme/src/project/NMEProject.hx
@@ -300,8 +300,8 @@ class NMEProject
                classPaths.push(cp);
             macros.push("--macro cpp.cppia.HostClasses.include()");
 
-         case "emscripten":
-            target = Platform.EMSCRIPTEN;
+         case "emscripten", "wasm":
+            target = Platform.WASM;
             targetFlags.set("emscripten", "");
             staticLink = true;
             haxedefs.set("emscripten","1");
@@ -451,7 +451,7 @@ class NMEProject
             platformType = Platform.TYPE_WEB;
             embedAssets = false;
 
-         case Platform.EMSCRIPTEN:
+         case Platform.EMSCRIPTEN, Platform.WASM:
             platformType = Platform.TYPE_WEB;
             embedAssets = true;