diff --git a/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk b/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk index 81c88e5795e..31a6054eb12 100644 --- a/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk +++ b/libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk @@ -65,13 +65,8 @@ PLATFORM_REQUIRED_ADDONS = ofxEmscripten # Note: Leave a leading space when adding list items with the += operator ################################################################################ -# ifdef EMSCRIPTEN_PTHREADS - PLATFORM_PTHREAD = #-s USE_PTHREADS=1 - CFLAG_PLATFORM_PTHREAD = #-pthread -matomics -mbulk-memory -# else -# PLATFORM_PTHREAD = -s USE_PTHREADS=0 -# CFLAG_PLATFORM_PTHREAD = -matomics -mbulk-memory -# endif +PLATFORM_PTHREAD = -pthread -matomics -mbulk-memory +CFLAG_PLATFORM_PTHREAD = -pthread -matomics -mbulk-memory ifdef VCPKG_ROOT TRIPPLET=wasm32-emscripten @@ -119,7 +114,8 @@ endif PLATFORM_LDFLAGS = --preload-file bin/data@data --emrun --bind --profiling-funcs PLATFORM_LDFLAGS += -s USE_WEBGPU=1 PLATFORM_LDFLAGS += -s MAX_WEBGL_VERSION=2 -s WEBGL2_BACKWARDS_COMPATIBILITY_EMULATION=1 -s FULL_ES2 -PLATFORM_LDFLAGS += -s AUTO_NATIVE_LIBRARIES=1 -s AUTO_JS_LIBRARIES=1 +PLATFORM_LDFLAGS += -s AUTO_NATIVE_LIBRARIES=1 +PLATFORM_LDFLAGS += -s AUTO_JS_LIBRARIES=1 PLATFORM_LDFLAGS += -s ASSERTIONS=2 PLATFORM_LDFLAGS += -s GL_ASSERTIONS=1 @@ -129,14 +125,15 @@ PLATFORM_LDFLAGS += -s VERBOSE=1 PLATFORM_LDFLAGS += $(PLATFORM_PTHREAD) # PLATFORM_LDFLAGS += -lGL # PLATFORM_LDFLAGS += -lhtml5 -# PLATFORM_LDFLAGS += -lopenal +#PLATFORM_LDFLAGS += -lopenal + PLATFORM_LDFLAGS += --js-library $(OF_ADDONS_PATH)/ofxEmscripten/libs/html5video/lib/emscripten/library_html5video.js # PLATFORM_LDFLAGS += --js-library $(OF_ADDONS_PATH)/ofxEmscripten/libs/html5audio/lib/emscripten/library_html5audio.js PLATFORM_LDFLAGS += -s MINIFY_HTML=0 -PLATFORM_LDFLAGS += -s MAIN_MODULE=1 \ - -s ASSERTIONS=2 \ - -s EXPORT_ALL=1 \ - -s NO_DYNAMIC_EXECUTION=1 +PLATFORM_LDFLAGS += -s MAIN_MODULE=1 -DEMCC_FORCE_STDLIBS=1 +PLATFORM_LDFLAGS += -s ASSERTIONS=2 +PLATFORM_LDFLAGS += -s EXPORT_ALL=1 +PLATFORM_LDFLAGS += -s NO_DYNAMIC_EXECUTION=1 PLATFORM_LDFLAGS += -s ALLOW_MEMORY_GROWTH=1 PLATFORM_LDFLAGS += -sLOAD_SOURCE_MAP=1 -sABORT_ON_WASM_EXCEPTIONS=0 PLATFORM_LDFLAGS += -s DYNAMIC_EXECUTION=0 -s EMBIND_AOT=1 @@ -144,11 +141,13 @@ PLATFORM_LDFLAGS += -s DYNAMIC_EXECUTION=0 -s EMBIND_AOT=1 #PLATFORM_LDFLAGS += -s MODULARIZE=1 #PLATFORM_LDFLAGS += -s EVAL_CTORS=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1 # PLATFORM_LDFLAGS += -s WASM_WORKERS=1 -s ENVIRONMENT="web,worker" -# PLATFORM_LDFLAGS += -s USE_GLFW=3 -lglfw +PLATFORM_LDFLAGS += -s USE_GLFW=3 -lglfw # PLATFORM_LDFLAGS += -sEXPORTED_FUNCTIONS=all #PLATFORM_LDFLAGS += -sEXPORTED_FUNCTIONS='["_main", "_malloc", "_free"]' PLATFORM_LDFLAGS += -sERROR_ON_UNDEFINED_SYMBOLS=0 +#PLATFORM_LDFLAGS += -s AUDIO_WORKLET=1 -s WASM_WORKERS=1 -sENVIRONMENT="web,worker" -s WEBAUDIO_DEBUG=1 + ifdef PROJECT_EMSCRIPTEN_TEMPLATE PLATFORM_LDFLAGS += --shell-file $(PROJECT_EMSCRIPTEN_TEMPLATE) else @@ -160,9 +159,6 @@ EMSCRIPTEN_CSS = $(OF_LIBS_PATH)/openFrameworksCompiled/project/emscripten/style EMSCRIPTEN_HTACCESS = $(OF_LIBS_PATH)/openFrameworksCompiled/project/emscripten/.htaccess OUTPUT_DIR = output - - - PLATFORM_OPTIMIZATION_LDFLAGS_RELEASE = -O3 -s TOTAL_MEMORY=$(PLATFORM_EMSCRIPTEN_TOTAL_MEMORY) -s WASM=1 -fPIC -gsource-map PLATFORM_OPTIMIZATION_LDFLAGS_DEBUG = -O1 -g -s ALLOW_MEMORY_GROWTH=1 -s TOTAL_MEMORY=134217728 -s WASM=1 -fPIC -s VERBOSE=1 -s GL_ASSERTIONS=1 -gsource-map diff --git a/scripts/dev/download_libs.sh b/scripts/dev/download_libs.sh index a4a3aa29529..780fb66b1d4 100755 --- a/scripts/dev/download_libs.sh +++ b/scripts/dev/download_libs.sh @@ -8,9 +8,8 @@ LEGACY=0 SILENT_ARGS="" NO_SSL="" BLEEDING_EDGE=0 -DL_VERSION=2.6.3 +DL_VERSION=2.6.4 TAG="" -PTHREADS=0 printHelp(){ cat << EOF @@ -114,9 +113,6 @@ while [[ $# -gt 0 ]]; do -s|--silent) SILENT_ARGS=1 ;; - -u|--pthreads) - PTHREADS=1 - ;; -k|--no-ssl) NO_SSL=1 ;; @@ -240,9 +236,6 @@ if [ "$PLATFORM" == "emscripten" ]; then if [[ $ARCH = "64" ]] ; then ARCH="_memory64" fi - if [[ $PTHREADS = 1 ]] ; then - ARCH="${ARCH}_pthreads" - fi fi fi diff --git a/scripts/emscripten/download_latest_libs_memory64_pthreads.sh b/scripts/emscripten/download_latest_libs_memory64_pthreads.sh deleted file mode 100755 index a926b3cc5b5..00000000000 --- a/scripts/emscripten/download_latest_libs_memory64_pthreads.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $SCRIPT_DIR -../dev/download_libs.sh -p emscripten -a 64 -u -b -t $@ diff --git a/scripts/emscripten/download_latest_libs_pthreads.sh b/scripts/emscripten/download_latest_libs_pthreads.sh deleted file mode 100755 index d0f50da5ce4..00000000000 --- a/scripts/emscripten/download_latest_libs_pthreads.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $SCRIPT_DIR -../dev/download_libs.sh -p emscripten -b -u -t $@ diff --git a/scripts/emscripten/download_latest_libs_memory64.sh b/scripts/emscripten/download_libs_memory64.sh similarity index 100% rename from scripts/emscripten/download_latest_libs_memory64.sh rename to scripts/emscripten/download_libs_memory64.sh diff --git a/scripts/emscripten/download_latest_libs_vcpkg.sh b/scripts/emscripten/download_libs_via_vcpkg.sh similarity index 100% rename from scripts/emscripten/download_latest_libs_vcpkg.sh rename to scripts/emscripten/download_libs_via_vcpkg.sh