Examples: disable GL related warnings on Mac + amend to ignore list.

fangshun2004 · Sep 27, 2022 · 73efcec · 73efcec
1 parent a725db1
commit 73efcec
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -45,9 +45,12 @@ examples/example_emscripten_wgpu/web/*
 cmake-build-*
 
 ## Unix executables from our example Makefiles
+examples/example_glfw_metal/example_glfw_metal
 examples/example_glfw_opengl2/example_glfw_opengl2
 examples/example_glfw_opengl3/example_glfw_opengl3
 examples/example_glut_opengl2/example_glut_opengl2
 examples/example_null/example_null
+examples/example_sdl_metal/example_sdl_metal
 examples/example_sdl_opengl2/example_sdl_opengl2
 examples/example_sdl_opengl3/example_sdl_opengl3
+examples/example_sdl_sdlrenderer/example_sdl_sdlrenderer
diff --git a/backends/imgui_impl_glut.cpp b/backends/imgui_impl_glut.cpp
@@ -31,6 +31,7 @@
 
 #include "imgui.h"
 #include "imgui_impl_glut.h"
+#define GL_SILENCE_DEPRECATION
 #ifdef __APPLE__
 #include <GLUT/glut.h>
 #else

diff --git a/examples/example_glfw_opengl3/main.cpp b/examples/example_glfw_opengl3/main.cpp
@@ -7,6 +7,7 @@
 #include "imgui_impl_glfw.h"
 #include "imgui_impl_opengl3.h"
 #include <stdio.h>
+#define GL_SILENCE_DEPRECATION
 #if defined(IMGUI_IMPL_OPENGL_ES2)
 #include <GLES2/gl2.h>
 #endif

diff --git a/examples/example_glut_opengl2/main.cpp b/examples/example_glut_opengl2/main.cpp
@@ -17,6 +17,7 @@
 #include "imgui.h"
 #include "imgui_impl_glut.h"
 #include "imgui_impl_opengl2.h"
+#define GL_SILENCE_DEPRECATION
 #ifdef __APPLE__
     #include <GLUT/glut.h>
 #else

diff --git a/examples/example_sdl_sdlrenderer/main.cpp b/examples/example_sdl_sdlrenderer/main.cpp
@@ -38,7 +38,7 @@ int main(int, char**)
     if (renderer == NULL)
     {
         SDL_Log("Error creating SDL_Renderer!");
-        return false;
+        return 0;
     }
     //SDL_RendererInfo info;
     //SDL_GetRendererInfo(renderer, &info);