build libs with emsdk 3.1.69

webarkit · Nov 5, 2024 · 3818d73 · 3818d73
1 parent dbd34f3
commit 3818d73
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 src/output
 node_modules
 build/*.bc
+build/*.o
 demo/public/marker
diff --git a/build/NftMarkerCreator.min.js b/build/NftMarkerCreator.min.js
diff --git a/build/NftMarkerCreator_wasm.js b/build/NftMarkerCreator_wasm.js
diff --git a/build/NftMarkerCreator_wasm.thread.js b/build/NftMarkerCreator_wasm.thread.js
diff --git a/build/NftMarkerCreator_wasm.thread.worker.js b/build/NftMarkerCreator_wasm.thread.worker.js
diff --git a/emscripten/WebARKitLib b/emscripten/WebARKitLib
diff --git a/package.json b/package.json
@@ -27,9 +27,11 @@
   "scripts": {
     "test": "jest",
     "build-local": "node tools/makem.js; echo Built at `date`",
+    "build-docker":  "docker exec emscripten-nft-marker-creator-app npm run build-local",
     "demo": "cd demo && node demoServer.js",
     "format": "prettier --write \"**/*.{js,json,css,md}\"",
-    "check-format": "prettier --check \"**/*.{js,json,css,md}\""
+    "check-format": "prettier --check \"**/*.{js,json,css,md}\"",
+    "setup-docker": "docker run -dit --name emscripten-nft-marker-creator-app -v $(pwd):/src emscripten/emsdk:3.1.69 bash"
   },
   "license": "LGPL-3.0",
   "devDependencies": {

diff --git a/tools/makem.js b/tools/makem.js
@@ -83,7 +83,7 @@ var kpm_sources = [
   "KPM/FreakMatcher/detectors/DoG_scale_invariant_detector.cpp",
   "KPM/FreakMatcher/detectors/gaussian_scale_space_pyramid.cpp",
   "KPM/FreakMatcher/detectors/gradients.cpp",
-  "KPM/FreakMatcher/detectors/harris.cpp",
+  //"KPM/FreakMatcher/detectors/harris.cpp",
   "KPM/FreakMatcher/detectors/orientation_assignment.cpp",
   "KPM/FreakMatcher/detectors/pyramid.cpp",
   "KPM/FreakMatcher/facade/visual_database_facade.cpp",
@@ -116,8 +116,6 @@ FLAGS += " -s TOTAL_MEMORY=" + MEM + " ";
 FLAGS += " -s ALLOW_MEMORY_GROWTH=1 ";
 FLAGS += " -s USE_ZLIB=1";
 FLAGS += " -s USE_LIBJPEG=1";
-//FLAGS += ' -s ASSERTIONS=1';
-FLAGS += " --memory-init-file 0 "; // for memless file
 FLAGS += " -s FORCE_FILESYSTEM=1";
 
 //ONLY ENABLE FOR THE NFT-MARKER-CREATOR WEB VERSION !IMPORTANT FLAGS
@@ -187,7 +185,7 @@ var compile_arlib = format(
     FLAGS +
     " " +
     DEFINES +
-    " -r -o {OUTPUT_PATH}libar.bc ",
+    " -r -o {OUTPUT_PATH}libar.o ",
   OUTPUT_PATH,
 );
 
@@ -196,7 +194,7 @@ var compile_combine_min = format(
     " " +
     INCLUDES +
     " " +
-    " {OUTPUT_PATH}libar.bc " +
+    " {OUTPUT_PATH}libar.o " +
     MAIN_SOURCES +
     EXPORTED_FUNCTIONS +
     FLAGS +
@@ -214,7 +212,7 @@ var compile_wasm = format(
     " " +
     INCLUDES +
     " " +
-    " {OUTPUT_PATH}libar.bc " +
+    " {OUTPUT_PATH}libar.o " +
     MAIN_SOURCES +
     EXPORTED_FUNCTIONS +
     FLAGS +
@@ -233,7 +231,7 @@ var compile_wasm_td = format(
     " " +
     INCLUDES +
     " " +
-    " {OUTPUT_PATH}libar.bc " +
+    " {OUTPUT_PATH}libar.o " +
     MAIN_SOURCES +
     EXPORTED_FUNCTIONS +
     FLAGS +
+13 −0		lib/SRC/ARUtil/log.c
+3 −2		lib/SRC/KPM/FreakMatcher/framework/error.h