Skip to content

Emscripten: bump to 6.0.6, fix template version macros and install script - #8555

Merged
danoli3 merged 1 commit into
openframeworks:masterfrom
danoli3:emscripten-6.0.6-bump
Sep 11, 2026
Merged

danoli3 merged 1 commit into
openframeworks:masterfrom
danoli3:emscripten-6.0.6-bump

Conversation

@danoli3

@danoli3 danoli3 commented Sep 11, 2026

Copy link
Copy Markdown
Member

Bump emsdk from 5.0.7 (of.yml) / 3.1.50 (manual-web) to 6.0.6.

  • Fix scripts/templates/emscripten/src/main.cpp: support both EMSCRIPTEN_MAJOR (new, >=3.1.30) and EMSCRIPTEN_major (old) via ifdef fallback
  • Fix scripts/emscripten/install_emscripten.sh: use VERSION variable, fix emsdk_env.sh sourcing, use command -v
  • Fix emscripten LDFLAGS: only preload bin/data if exists, FULL_ES2 -> FULL_ES3 for WebGL2 on 6.x

Split from #8533 OpenGLES 3.1 to land emscripten bump independently.

…ript

- Bump emsdk from 5.0.7 (of.yml) / 3.1.50 (manual-web) to 6.0.6
- Fix scripts/templates/emscripten/src/main.cpp: support both
  __EMSCRIPTEN_MAJOR__ (new, >=3.1.30) and __EMSCRIPTEN_major__
  (old) via ifdef fallback
- Fix scripts/emscripten/install_emscripten.sh: use VERSION
  variable, fix emsdk_env.sh sourcing, use command -v
- Fix emscripten LDFLAGS: only preload bin/data if exists,
  FULL_ES2 -> FULL_ES3 for WebGL2 on 6.x
@danoli3
danoli3 merged commit ae054c2 into openframeworks:master Sep 11, 2026
20 checks passed
danoli3 added a commit to danoli3/openFrameworks that referenced this pull request Sep 11, 2026
Master openframeworks#8555 introduced the version-macro fallbacks but left
tofGLWindowSettings; restore ofGLWindowSettings so the template compiles.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant