Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix emscripten including metalangle and assertions warning #8275

Merged
merged 11 commits into from
Feb 20, 2025
Merged

Fix emscripten including metalangle and assertions warning #8275

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cae81b3
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Jan 10, 2024
95d361b
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Feb 16, 2024
9844c9a
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo May 6, 2024
e614e73
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo May 10, 2024
83ea371
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Jul 12, 2024
90f1e53
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Jul 12, 2024
96e307c
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Oct 16, 2024
d52b761
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Oct 16, 2024
a2fd4e4
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Nov 26, 2024
a4a476f
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Feb 20, 2025
c7c158f
fix for emscripten trying to include metalangle closes ##8273
ofTheo Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk
View file
Open in desktop
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
Loading