upgraded emcc to 3.1.69

- build .o files instead of .bc - related to issue #363
webarkit · Oct 23, 2024 · 0c53dc3 · 0c53dc3
1 parent dae41b5
commit 0c53dc3
Show file tree

Hide file tree

Showing 13 changed files with 93,908 additions and 91,322 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 build/*.bc
+build/*.o
 node_modules
 docs/*
diff --git a/build/artoolkitNFT.debug.js b/build/artoolkitNFT.debug.js
diff --git a/build/artoolkitNFT.min.js b/build/artoolkitNFT.min.js
diff --git a/build/artoolkitNFT_ES6_wasm.js b/build/artoolkitNFT_ES6_wasm.js
diff --git a/build/artoolkitNFT_ES6_wasm.simd.js b/build/artoolkitNFT_ES6_wasm.simd.js
diff --git a/build/artoolkitNFT_ES6_wasm_td.js b/build/artoolkitNFT_ES6_wasm_td.js
diff --git a/build/artoolkitNFT_ES6_wasm_td.worker.js b/build/artoolkitNFT_ES6_wasm_td.worker.js
diff --git a/build/artoolkitNFT_embed_ES6_wasm.js b/build/artoolkitNFT_embed_ES6_wasm.js
diff --git a/build/artoolkitNFT_thread.js b/build/artoolkitNFT_thread.js
diff --git a/build/artoolkitNFT_thread.worker.js b/build/artoolkitNFT_thread.worker.js
diff --git a/build/artoolkitNFT_wasm.js b/build/artoolkitNFT_wasm.js
diff --git a/build/artoolkitNFT_wasm.simd.js b/build/artoolkitNFT_wasm.simd.js
diff --git a/tools/makem.js b/tools/makem.js
@@ -183,7 +183,7 @@ var kpm_sources = [
   "FreakMatcher/detectors/DoG_scale_invariant_detector.cpp",
   "FreakMatcher/detectors/gaussian_scale_space_pyramid.cpp",
   "FreakMatcher/detectors/gradients.cpp",
-  "FreakMatcher/detectors/harris.cpp",
+  //"FreakMatcher/detectors/harris.cpp",
   "FreakMatcher/detectors/orientation_assignment.cpp",
   "FreakMatcher/detectors/pyramid.cpp",
   "FreakMatcher/facade/visual_database_facade.cpp",
@@ -222,7 +222,7 @@ FLAGS += " -Wno-warn-absolute-paths";
 FLAGS += " -s TOTAL_MEMORY=" + MEM + " ";
 FLAGS += " -s USE_ZLIB=1";
 FLAGS += " -s USE_LIBJPEG=1";
-FLAGS += " --memory-init-file 0"; // for memless file
+//FLAGS += " --memory-init-file 0"; // for memless file
 FLAGS += ' -s EXPORTED_RUNTIME_METHODS=["FS"]';
 FLAGS += " -s ALLOW_MEMORY_GROWTH=1";
 
@@ -306,7 +306,7 @@ var compile_arlib = format(
     FLAGS +
     " " +
     DEFINES +
-    " -r -o {OUTPUT_PATH}libar.bc ",
+    " -r -o {OUTPUT_PATH}libar.o ",
   OUTPUT_PATH,
 );
 
@@ -319,7 +319,7 @@ var compile_thread_arlib = format(
     " " +
     "-pthread " +
     DEFINES +
-    " -r -o {OUTPUT_PATH}libar_td.bc ",
+    " -r -o {OUTPUT_PATH}libar_td.o ",
   OUTPUT_PATH,
 );
 
@@ -332,13 +332,13 @@ var compile_simd_arlib = format(
     SIMD128_FLAGS +
     " " +
     DEFINES +
-    " -r -o {OUTPUT_PATH}libar_simd.bc ",
+    " -r -o {OUTPUT_PATH}libar_simd.o ",
   OUTPUT_PATH,
 );
 
-var ALL_BC = " {OUTPUT_PATH}libar.bc ";
-var THREAD_BC = " {OUTPUT_PATH}libar_td.bc ";
-var SIMD_BC = " {OUTPUT_PATH}libar_simd.bc ";
+var ALL_BC = " {OUTPUT_PATH}libar.o ";
+var THREAD_BC = " {OUTPUT_PATH}libar_td.o ";
+var SIMD_BC = " {OUTPUT_PATH}libar_simd.o ";
 
 var compile_combine = format(
   EMCC +