Ensure emnapiInit function is exported

Prevents latest emscripten optimising it away
lovell · Aug 12, 2024 · ad36fa0 · ad36fa0
1 parent de42667
commit ad36fa0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/binding.gyp b/src/binding.gyp
@@ -192,7 +192,7 @@
                 '-Oz',
                 '-sALLOW_MEMORY_GROWTH',
                 '-sENVIRONMENT=node',
-                '-sEXPORTED_FUNCTIONS=["_vips_shutdown", "_uv_library_shutdown"]',
+                '-sEXPORTED_FUNCTIONS=["emnapiInit", "_vips_shutdown", "_uv_library_shutdown"]',
                 '-sNODERAWFS',
                 '-sTEXTDECODER=0',
                 '-sWASM_ASYNC_COMPILATION=0',

diff --git a/src/emscripten/common.gypi b/src/emscripten/common.gypi
@@ -9,8 +9,7 @@
     'default_configuration': 'Release',
     'type': 'executable',
     'cflags': [
-      '-pthread',
-      '-sDEFAULT_TO_CXX=0'
+      '-pthread'
     ],
     'cflags_cc': [
       '-pthread'
@@ -19,6 +18,7 @@
       '--js-library=<!(node -p "require(\'emnapi\').js_library")',
       '-sAUTO_JS_LIBRARIES=0',
       '-sAUTO_NATIVE_LIBRARIES=0',
+      '-sDEFAULT_TO_CXX=0',
       '-sNODEJS_CATCH_EXIT=0',
       '-sNODEJS_CATCH_REJECTION=0'
     ],
@@ -28,7 +28,7 @@
       'EMNAPI_WORKER_POOL_SIZE=1'
     ],
     'include_dirs': [
-      '<!(node -p "require(\'emnapi\').include")'
+      '<!(node -p "require(\'emnapi\').include_dir")'
     ],
     'sources': [
       '<!@(node -p "require(\'emnapi\').sources.map(x => JSON.stringify(path.relative(process.cwd(), x))).join(\' \')")'