From 7dc2fc714510a24e1b013553d6988e2e01ce4f5b Mon Sep 17 00:00:00 2001 From: vanfanel Date: Sat, 10 Feb 2024 14:30:09 +0100 Subject: [PATCH] Remove GLEW remains on Windows. --- extern/CMakeLists.txt | 2 +- src/graphic/Fast3D/gfx_opengl.cpp | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index d81313843..af8a77db2 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -110,7 +110,7 @@ endif() if (CMAKE_SYSTEM_NAME STREQUAL "Windows") find_package(GLEW REQUIRED) - target_link_libraries(ImGui PUBLIC opengl32 GLEW::GLEW) + target_link_libraries(ImGui PUBLIC opengl32) elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin") find_package(GLEW REQUIRED) target_link_libraries(ImGui PUBLIC ${OPENGL_opengl_LIBRARY} GLEW::GLEW) diff --git a/src/graphic/Fast3D/gfx_opengl.cpp b/src/graphic/Fast3D/gfx_opengl.cpp index daea98d71..de8c3b8a2 100644 --- a/src/graphic/Fast3D/gfx_opengl.cpp +++ b/src/graphic/Fast3D/gfx_opengl.cpp @@ -21,10 +21,9 @@ #ifdef _MSC_VER #include -// #define GL_GLEXT_PROTOTYPES 1 -#include +#define GL_GLEXT_PROTOTYPES 1 +#include #elif FOR_WINDOWS -#include #include "SDL.h" #define GL_GLEXT_PROTOTYPES 1 #include "SDL_opengl.h" @@ -846,10 +845,6 @@ static void gfx_opengl_draw_triangles(float buf_vbo[], size_t buf_vbo_len, size_ } static void gfx_opengl_init(void) { -#if !defined(__SWITCH__) && !defined(__linux__) - glewInit(); -#endif - glGenBuffers(1, &opengl_vbo); glBindBuffer(GL_ARRAY_BUFFER, opengl_vbo);