mirror of
https://github.com/ocornut/imgui.git
synced 2026-06-01 01:34:57 +08:00
Examples: GLFW+OpenGL3, GLFW+WGPU: Emscripten Makefiles uses port contrib.glfw3 (#8742)
build / Windows (push) Has been cancelled
build / Linux (push) Has been cancelled
build / MacOS (push) Has been cancelled
build / iOS (push) Has been cancelled
build / Emscripten (push) Has been cancelled
build / Android (push) Has been cancelled
scheduled / scheduled (push) Has been cancelled
build / Windows (push) Has been cancelled
build / Linux (push) Has been cancelled
build / MacOS (push) Has been cancelled
build / iOS (push) Has been cancelled
build / Emscripten (push) Has been cancelled
build / Android (push) Has been cancelled
scheduled / scheduled (push) Has been cancelled
This unofficial port offers a better support for HighDPI. See - https://emscripten.org/docs/compiling/Contrib-Ports.html - https://github.com/pongasoft/emscripten-glfw
This commit is contained in:
@@ -61,6 +61,8 @@ Other changes:
|
|||||||
- Demo: Added "Text -> Font Size" demo section. (#8738) [@Demonese]
|
- Demo: Added "Text -> Font Size" demo section. (#8738) [@Demonese]
|
||||||
- CI: Fixed dllimport/dllexport tests. (#8757) [@AidanSun05]
|
- CI: Fixed dllimport/dllexport tests. (#8757) [@AidanSun05]
|
||||||
- CI: Updated to use latest Windows image + VS2022.
|
- CI: Updated to use latest Windows image + VS2022.
|
||||||
|
- Examples: GLFW+OpenGL3, GLFW+WGPU: Emscripten Makefiles uses GLFW port
|
||||||
|
'contrib.glfw3' which offers better HiDPI support. (#8742) [@pthom]
|
||||||
- Backends: GLFW, SDL2 made ImGui_ImplGLFW_GetContentScaleXXX() and
|
- Backends: GLFW, SDL2 made ImGui_ImplGLFW_GetContentScaleXXX() and
|
||||||
ImGui_ImplSDL2_GetContentScaleXXXX() helpers return 1.0f on Emscripten
|
ImGui_ImplSDL2_GetContentScaleXXXX() helpers return 1.0f on Emscripten
|
||||||
and Android platforms, matching macOS logic. (#8742, #8733) [@pthom]
|
and Android platforms, matching macOS logic. (#8742, #8733) [@pthom]
|
||||||
|
|||||||
@@ -32,8 +32,9 @@ EMS =
|
|||||||
##---------------------------------------------------------------------
|
##---------------------------------------------------------------------
|
||||||
|
|
||||||
# ("EMS" options gets added to both CPPFLAGS and LDFLAGS, whereas some options are for linker only)
|
# ("EMS" options gets added to both CPPFLAGS and LDFLAGS, whereas some options are for linker only)
|
||||||
EMS += -s DISABLE_EXCEPTION_CATCHING=1
|
# 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.
|
||||||
LDFLAGS += -s USE_GLFW=3 -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1
|
EMS += -s DISABLE_EXCEPTION_CATCHING=1 --use-port=contrib.glfw3
|
||||||
|
LDFLAGS += -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1
|
||||||
|
|
||||||
# Build as single file (binary text encoded in .html file)
|
# Build as single file (binary text encoded in .html file)
|
||||||
#LDFLAGS += -sSINGLE_FILE
|
#LDFLAGS += -sSINGLE_FILE
|
||||||
|
|||||||
@@ -32,8 +32,9 @@ EMS =
|
|||||||
##---------------------------------------------------------------------
|
##---------------------------------------------------------------------
|
||||||
|
|
||||||
# ("EMS" options gets added to both CPPFLAGS and LDFLAGS, whereas some options are for linker only)
|
# ("EMS" options gets added to both CPPFLAGS and LDFLAGS, whereas some options are for linker only)
|
||||||
EMS += -s DISABLE_EXCEPTION_CATCHING=1
|
# 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.
|
||||||
LDFLAGS += -s USE_GLFW=3 -s USE_WEBGPU=1
|
EMS += -s DISABLE_EXCEPTION_CATCHING=1 --use-port=contrib.glfw3
|
||||||
|
LDFLAGS += -s USE_WEBGPU=1
|
||||||
LDFLAGS += -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1
|
LDFLAGS += -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s NO_EXIT_RUNTIME=0 -s ASSERTIONS=1
|
||||||
|
|
||||||
# Build as single file (binary text encoded in .html file)
|
# Build as single file (binary text encoded in .html file)
|
||||||
|
|||||||
Reference in New Issue
Block a user