diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 736c47ea4..0a04fc4c8 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -41,6 +41,9 @@ Other Changes: - Misc: Added ImGuiMouseCursor_NotAllowed enum so it can be used by more shared widgets. [@rokups] - Backends: GLFW, SDL, Win32, OSX, Allegro: Added support for ImGuiMouseCursor_NotAllowed. [@rokups] - Backends: GLFW: Added support for the missing mouse cursors newly added in GLFW 3.4+. [@rokups] +- Examples: Explicitly adding -DIMGUI_IMPL_OPENGL_LOADER_GL3W to Makefile to match linking + settings (otherwise if another loader such as Glew is accessible, the opengl3 backend might + automatically use it). [#2919, #2798] - Examples: Metal: Wrapped main loop in @autoreleasepool block to ensure allocations get freed even if underlying system event loop gets paused due to app nap (#2910, #2917). [@bear24rw] diff --git a/examples/example_glfw_opengl2/Makefile b/examples/example_glfw_opengl2/Makefile index 3649b7175..38f865bae 100644 --- a/examples/example_glfw_opengl2/Makefile +++ b/examples/example_glfw_opengl2/Makefile @@ -52,7 +52,7 @@ ifeq ($(findstring MINGW,$(UNAME_S)),MINGW) ECHO_MESSAGE = "MinGW" LIBS += -lglfw3 -lgdi32 -lopengl32 -limm32 - CXXFLAGS += -I../libs/gl3w `pkg-config --cflags glfw3` + CXXFLAGS += `pkg-config --cflags glfw3` CFLAGS = $(CXXFLAGS) endif diff --git a/examples/example_glfw_opengl3/Makefile b/examples/example_glfw_opengl3/Makefile index 7e17476c7..f72f46691 100644 --- a/examples/example_glfw_opengl3/Makefile +++ b/examples/example_glfw_opengl3/Makefile @@ -31,7 +31,7 @@ LIBS = ## Using OpenGL loader: gl3w [default] SOURCES += ../libs/gl3w/GL/gl3w.c -CXXFLAGS += -I../libs/gl3w +CXXFLAGS += -I../libs/gl3w -DIMGUI_IMPL_OPENGL_LOADER_GL3W ## Using OpenGL loader: glew ## (This assumes a system-wide installation) diff --git a/examples/example_null/Makefile b/examples/example_null/Makefile index 56c5f3da9..3930eb279 100644 --- a/examples/example_null/Makefile +++ b/examples/example_null/Makefile @@ -65,10 +65,6 @@ endif %.o:../../%.cpp $(CXX) $(CXXFLAGS) -c -o $@ $< -%.o:../libs/gl3w/GL/%.c -# %.o:../libs/glad/src/%.c - $(CC) $(CFLAGS) -c -o $@ $< - all: $(EXE) @echo Build complete for $(ECHO_MESSAGE) diff --git a/examples/example_sdl_opengl3/Makefile b/examples/example_sdl_opengl3/Makefile index 9e84df92b..12d8b57c1 100644 --- a/examples/example_sdl_opengl3/Makefile +++ b/examples/example_sdl_opengl3/Makefile @@ -31,7 +31,7 @@ LIBS = ## Using OpenGL loader: gl3w [default] SOURCES += ../libs/gl3w/GL/gl3w.c -CXXFLAGS += -I../libs/gl3w +CXXFLAGS += -I../libs/gl3w -DIMGUI_IMPL_OPENGL_LOADER_GL3W ## Using OpenGL loader: glew ## (This assumes a system-wide installation)