diff --git a/CMakeLists.txt b/CMakeLists.txt index a6b4ee2a..2f3a8bb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ option(FORCE_LOCAL_LIBS "Compile the built-in versions of SDL2, FreeType, and FL project(CSE2 LANGUAGES C CXX) -add_executable(CSE2 WIN32 +add_executable(CSE2 "${ASSETS_DIRECTORY}/resources/CSE2.rc" "src/ArmsItem.cpp" "src/ArmsItem.h" diff --git a/external/glad/include/glad/glad.h b/external/glad/include/glad/glad.h index 39d8722e..1b59b588 100644 --- a/external/glad/include/glad/glad.h +++ b/external/glad/include/glad/glad.h @@ -86,7 +86,7 @@ GLAPI int gladLoadGL(void); GLAPI int gladLoadGLLoader(GLADloadproc); -#include +#include "../KHR/khrplatform.h" typedef unsigned int GLenum; typedef unsigned char GLboolean; typedef unsigned int GLbitfield; diff --git a/src/Backends/Window/GLFW3-OpenGL3.cpp b/src/Backends/Window/GLFW3-OpenGL3.cpp index 25a9d37f..7df4dc0a 100644 --- a/src/Backends/Window/GLFW3-OpenGL3.cpp +++ b/src/Backends/Window/GLFW3-OpenGL3.cpp @@ -53,7 +53,7 @@ BOOL WindowBackend_OpenGL_CreateWindow(const char *window_title, int *screen_wid glfwMakeContextCurrent(window); #ifndef USE_OPENGLES2 - if (gladLoadGLLoader(glfwGetProcAddress)) + if (gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) { // Check if the platform supports OpenGL 3.2 if (GLAD_GL_VERSION_3_2) diff --git a/src/Backends/Window/SDL2-OpenGL3.cpp b/src/Backends/Window/SDL2-OpenGL3.cpp index f9e22145..9a8fff5a 100644 --- a/src/Backends/Window/SDL2-OpenGL3.cpp +++ b/src/Backends/Window/SDL2-OpenGL3.cpp @@ -43,7 +43,7 @@ BOOL WindowBackend_OpenGL_CreateWindow(const char *window_title, int *screen_wid if (SDL_GL_MakeCurrent(window, context) == 0) { #ifndef USE_OPENGLES2 - if (gladLoadGLLoader(SDL_GL_GetProcAddress)) + if (gladLoadGLLoader((GLADloadproc)SDL_GL_GetProcAddress)) { // Check if the platform supports OpenGL 3.2 if (GLAD_GL_VERSION_3_2)