Skip to content

Commit

Permalink
fix for emscripten trying to include metalangle closes ##8273 (#8275)
Browse files Browse the repository at this point in the history
  • Loading branch information
ofTheo authored Feb 20, 2025
1 parent 44b6186 commit 6c53cfb
Showing 1 changed file with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ ifdef VCPKG_ROOT
endif

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

ifdef EMSCRIPTEN_MEMORY64
PLATFORM_CFLAGS += -s MEMORY64=1
Expand Down Expand Up @@ -117,7 +117,6 @@ PLATFORM_LDFLAGS += -s MAX_WEBGL_VERSION=2 -s WEBGL2_BACKWARDS_COMPATIBILITY_EMU
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
PLATFORM_LDFLAGS += -s VERBOSE=1

Expand All @@ -131,7 +130,6 @@ PLATFORM_LDFLAGS += --js-library $(OF_ADDONS_PATH)/ofxEmscripten/libs/html5video
# 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 -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
Expand Down Expand Up @@ -234,6 +232,7 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/brotli/%
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/cairo/%
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/download/%
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/pixman/%
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/metalangle/%
# PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/freetype/lib/%

################################################################################
Expand Down

0 comments on commit 6c53cfb

Please sign in to comment.