Skip to content

Commit ed7d965

Browse files
pthomocornut
authored andcommitted
Examples: GLFW+OpenGL3, GLFW+WGPU: Emscripten Makefiles uses port contrib.glfw3 (#8742)
This unofficial port offers a better support for HighDPI. See - https://emscripten.org/docs/compiling/Contrib-Ports.html - https://github.com/pongasoft/emscripten-glfw
1 parent 18dca11 commit ed7d965

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

docs/CHANGELOG.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ Other changes:
6161
- Demo: Added "Text -> Font Size" demo section. (#8738) [@Demonese]
6262
- CI: Fixed dllimport/dllexport tests. (#8757) [@AidanSun05]
6363
- CI: Updated to use latest Windows image + VS2022.
64+
- Examples: GLFW+OpenGL3, GLFW+WGPU: Emscripten Makefiles uses GLFW port
65+
'contrib.glfw3' which offers better HiDPI support. (#8742) [@pthom]
6466
- Backends: GLFW, SDL2 made ImGui_ImplGLFW_GetContentScaleXXX() and
6567
ImGui_ImplSDL2_GetContentScaleXXXX() helpers return 1.0f on Emscripten
6668
and Android platforms, matching macOS logic. (#8742, #8733) [@pthom]

examples/example_glfw_opengl3/Makefile.emscripten

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ EMS =
3232
##---------------------------------------------------------------------
3333

3434
# ("EMS" options gets added to both CPPFLAGS and LDFLAGS, whereas some options are for linker only)
35-
EMS += -s DISABLE_EXCEPTION_CATCHING=1
36-
LDFLAGS += -s USE_GLFW=3 -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1
35+
# Note: For glfw, we use emscripten-glfw port (contrib.glfw3) instead of ('-s USE_GLFW=3' in LDFLAGS) to get a better support for High DPI displays.
36+
EMS += -s DISABLE_EXCEPTION_CATCHING=1 --use-port=contrib.glfw3
37+
LDFLAGS += -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1
3738

3839
# Build as single file (binary text encoded in .html file)
3940
#LDFLAGS += -sSINGLE_FILE

examples/example_glfw_wgpu/Makefile.emscripten

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ EMS =
3232
##---------------------------------------------------------------------
3333

3434
# ("EMS" options gets added to both CPPFLAGS and LDFLAGS, whereas some options are for linker only)
35-
EMS += -s DISABLE_EXCEPTION_CATCHING=1
36-
LDFLAGS += -s USE_GLFW=3 -s USE_WEBGPU=1
35+
# Note: For glfw, we use emscripten-glfw port (contrib.glfw3) instead of (-s USE_GLFW=3) to get a better support for High DPI displays.
36+
EMS += -s DISABLE_EXCEPTION_CATCHING=1 --use-port=contrib.glfw3
37+
LDFLAGS += -s USE_WEBGPU=1
3738
LDFLAGS += -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1
3839

3940
# Build as single file (binary text encoded in .html file)

0 commit comments

Comments
 (0)