Skip to content

Commit 6c53cfb

Browse files
authored
fix for emscripten trying to include metalangle closes ##8273 (#8275)
1 parent 44b6186 commit 6c53cfb

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ ifdef VCPKG_ROOT
7575
endif
7676

7777
# Code Generation Option Flags (http://gcc.gnu.org/onlinedocs/gcc/Code-Gen-Options.html)
78-
PLATFORM_CFLAGS = -std=c17 -fPIC $(CFLAG_PLATFORM_PTHREAD) -s ASSERTIONS=2
79-
PLATFORM_CXXFLAGS = -Wall -std=c++23 -fPIC -Wno-warn-absolute-paths $(CFLAG_PLATFORM_PTHREAD) -s ASSERTIONS=2
78+
PLATFORM_CFLAGS = -std=c17 -fPIC $(CFLAG_PLATFORM_PTHREAD)
79+
PLATFORM_CXXFLAGS = -Wall -std=c++23 -fPIC -Wno-warn-absolute-paths $(CFLAG_PLATFORM_PTHREAD)
8080

8181
ifdef EMSCRIPTEN_MEMORY64
8282
PLATFORM_CFLAGS += -s MEMORY64=1
@@ -117,7 +117,6 @@ PLATFORM_LDFLAGS += -s MAX_WEBGL_VERSION=2 -s WEBGL2_BACKWARDS_COMPATIBILITY_EMU
117117
PLATFORM_LDFLAGS += -s AUTO_NATIVE_LIBRARIES=1
118118
PLATFORM_LDFLAGS += -s AUTO_JS_LIBRARIES=1
119119

120-
PLATFORM_LDFLAGS += -s ASSERTIONS=2
121120
PLATFORM_LDFLAGS += -s GL_ASSERTIONS=1
122121
PLATFORM_LDFLAGS += -s VERBOSE=1
123122

@@ -131,7 +130,6 @@ PLATFORM_LDFLAGS += --js-library $(OF_ADDONS_PATH)/ofxEmscripten/libs/html5video
131130
# PLATFORM_LDFLAGS += --js-library $(OF_ADDONS_PATH)/ofxEmscripten/libs/html5audio/lib/emscripten/library_html5audio.js
132131
PLATFORM_LDFLAGS += -s MINIFY_HTML=0
133132
PLATFORM_LDFLAGS += -s MAIN_MODULE=1 -DEMCC_FORCE_STDLIBS=1
134-
PLATFORM_LDFLAGS += -s ASSERTIONS=2
135133
PLATFORM_LDFLAGS += -s EXPORT_ALL=1
136134
PLATFORM_LDFLAGS += -s NO_DYNAMIC_EXECUTION=1
137135
PLATFORM_LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
@@ -234,6 +232,7 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/brotli/%
234232
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/cairo/%
235233
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/download/%
236234
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/pixman/%
235+
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/metalangle/%
237236
# PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/freetype/lib/%
238237

239238
################################################################################

0 commit comments

Comments
 (0)