Merge pull request KhronosGroup#26 from prestomation/master

Modularize emscripten build.
MarkCallow · Jun 26, 2019 · 087198f · 087198f
2 parents bbbce07 + 39b5c5b
commit 087198f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/webgl/gltf/index.html b/webgl/gltf/index.html
@@ -15,7 +15,7 @@
 
 <body>
   <script>
-    Module.onRuntimeInitialized = () => {
+    BASIS().then(Module => {
 
       const { BasisFile, initializeBasis } = Module;
 
@@ -97,7 +97,7 @@
 
       }, false );
 
-    }
+    });
 
     function log(s) {
 

diff --git a/webgl/texture/index.html b/webgl/texture/index.html
@@ -258,7 +258,7 @@
   <div id='logger'></div>
 </body>
 <script>
-  Module.onRuntimeInitialized = () => {
+  BASIS({onRuntimeInitialized : () => {
     var gl = elem('canvas').getContext('webgl');
     // Load the DXT extension, and verify it exists.
     if (!gl.getExtension('WEBKIT_WEBGL_compressed_texture_s3tc') && !gl.getExtension('WEBGL_compressed_texture_s3tc')) {
@@ -275,6 +275,6 @@
     }, false);
 
     runLoadFile();
-  }
+  }}).then(module => window.Module = module);
 </script>
 </html>
diff --git a/webgl/transcoder/CMakeLists.txt b/webgl/transcoder/CMakeLists.txt
@@ -17,5 +17,5 @@ if (EMSCRIPTEN)
   set_target_properties(basis_transcoder.js PROPERTIES
       OUTPUT_NAME "basis_transcoder"
       SUFFIX ".js"
-      LINK_FLAGS "--bind -s ALLOW_MEMORY_GROWTH=1 -O3 -s ASSERTIONS=0 -s MALLOC=emmalloc")
+      LINK_FLAGS "--bind -s ALLOW_MEMORY_GROWTH=1 -O3 -s ASSERTIONS=0 -s MALLOC=emmalloc -s MODULARIZE=1 -s EXPORT_NAME=BASIS ")
 endif()
diff --git a/webgl/transcoder/build/basis_transcoder.js b/webgl/transcoder/build/basis_transcoder.js
diff --git a/webgl/transcoder/build/basis_transcoder.wasm b/webgl/transcoder/build/basis_transcoder.wasm