mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-06 19:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_sdlrenderer.h
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
ocornut
2023-05-31 14:51:56 +02:00
parent 3418d50949 5319d1cffa
commit 823a1385a2
34 changed files with 1023 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example_sdl3_opengl3/main.cpp
View File

@@ -14,7 +14,7 @@
#include <SDL3/SDL_opengl.h>
#endif
// This example can also compile and run with Emscripten! See 'Makefile.emscripten' for details.
// This example doesn't compile with Emscripten yet! Awaiting SDL3 support.
#ifdef __EMSCRIPTEN__
#include "../libs/emscripten/emscripten_mainloop_stub.h"
#endif