fix mixed static test

harfang3d · Nov 28, 2022 · a7b71d1 · a7b71d1
1 parent 1801879
commit a7b71d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages.d/harfang/harfang.sh b/packages.d/harfang/harfang.sh
@@ -95,8 +95,8 @@ emcmake cmake $HG_SRC_DIR \
     -DPython3_Development.Embed_FOUND=TRUE \
 
 
-#
-if EMCC_CFLAGS="-DBX_CONFIG_DEBUG=0 -I${SDKROOT}/devices/emsdk/usr/include/python${PYBUILD} -Wno-unused-command-line-argument -lopenal" make -j4
+# cannot use -fno-exceptions
+if EMCC_CFLAGS="-sDISABLE_EXCEPTION_CATCHING=1 -fno-rtti -DBX_CONFIG_DEBUG=0 -I${SDKROOT}/devices/emsdk/usr/include/python${PYBUILD} -Wno-unused-command-line-argument -lopenal" make -j4
 then
     HG=$(pwd)
 

diff --git a/vendor/vendor.sh b/vendor/vendor.sh
@@ -1,7 +1,10 @@
-if $STATIC
-    export PACKAGES="emsdk harfang"
+if echo "$PACKAGES" |grep -q emsdk
+then
+    # mixed static
+    export PACKAGES="$PACKAGES harfang"
 else
-    export PACKAGES="emsdk"
+    # standalone
+    export PACKAGES="emsdk harfang"
 fi
 export VENDOR=harfang
-export LD_VENDOR="-sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sFULL_ES2 -sFULL_ES3" 
+export LD_VENDOR="$LD_VENDOR -sUSE_WEBGL2 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 -sFULL_ES2 -sFULL_ES3"