Merge pull request #11 from shuding/update-bindings

Update bindings

.github/workflows/ci.yaml

@@ -14,9 +14,9 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: mymindstorm/setup-emsdk@v11
+      - uses: mymindstorm/setup-emsdk@v12
         with:
-          version: 3.1.26
+          version: 3.1.31
           actions-cache-folder: "emsdk-cache"
       - name: Use pnpm
         run: corepack enable pnpm && pnpm --version

Makefile

@@ -3,12 +3,17 @@ CC=emcc
 all: clean dir wasm asm
 
 wasm:
-	$(CC) yoga/yoga/*.cpp bindings/*.cc \
+	$(CC) yoga/yoga/*.cpp yoga/yoga/**/*.cpp yoga/javascript/src_native/*.cc \
 		--bind \
 		-Iyoga \
 		-g0 \
-		-Os \
+		-O3 \
 		-flto \
+		-std=c++14 \
+		-fno-exceptions \
+		-fno-rtti \
+		-DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
+		--closure 1 \
 		-s WASM=1 \
 		-s WASM_ASYNC_COMPILATION=1 \
 		-s USE_CLOSURE_COMPILER=1 \
@@ -19,19 +24,25 @@ wasm:
 		-s DYNAMIC_EXECUTION=0 \
 		-s TEXTDECODER=0 \
 		-s ENVIRONMENT='web' \
+		-s FETCH_SUPPORT_INDEXEDDB=0 \
 		-s FILESYSTEM=0 \
 		-s MALLOC="emmalloc" \
-		-s INCOMING_MODULE_JS_API=['instantiateWasm','locateFile']\
+		-s INCOMING_MODULE_JS_API=['instantiateWasm']\
 		-s EXPORT_NAME="yoga" \
 		-o tmp/yoga.mjs
 
 asm:
-	$(CC) yoga/yoga/*.cpp bindings/*.cc \
+	$(CC) yoga/yoga/*.cpp yoga/yoga/**/*.cpp yoga/javascript/src_native/*.cc \
 		--bind \
 		-Iyoga \
 		-g0 \
 		-Os \
 		-flto \
+		-std=c++14 \
+		-fno-exceptions \
+		-fno-rtti \
+		-DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
+		--closure 1 \
 		--memory-init-file 0 \
 		-s WASM=0 \
 		-s WASM_ASYNC_COMPILATION=0 \
@@ -43,7 +54,7 @@ asm:
 		-s DYNAMIC_EXECUTION=0 \
 		-s TEXTDECODER=0 \
 		-s ENVIRONMENT='web' \
-		-s ERROR_ON_UNDEFINED_SYMBOLS=0 \
+		-s FETCH_SUPPORT_INDEXEDDB=0 \
 		-s FILESYSTEM=0 \
 		-s MALLOC="emmalloc" \
 		-s EXPORT_NAME="yoga" \

asm.d.ts

@@ -0,0 +1,6 @@
+import type { Yoga } from "./dist/wrapAsm";
+
+export * from "./dist/generated/YGEnums";
+export * from "./dist/wrapAsm";
+
+export default function (): Yoga;

asm.js

@@ -1,10 +1,6 @@
-import entry from './entry/index.js'
-import yoga from './tmp/yoga-asm.mjs'
-
-function bind(_, proto) {
-  return proto
-}
+import wrapAsm from "./yoga/javascript/src_js/wrapAsm.js";
+import yoga from "./tmp/yoga-asm.mjs";
 
 export default function () {
-  return entry(bind, yoga())
+  return wrapAsm(yoga());
 }