ref: 30c7967ed45b6ad7067073058e5ae65066b79f95
parent: 85e1afb35ab4804010137985c2a45d93f5da2192
author: Clownacy <[email protected]>
date: Wed Apr 1 19:15:22 EDT 2020
Fixes
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@
project(CSE2 LANGUAGES C CXX)
-add_executable(CSE2 WIN32
+add_executable(CSE2
"${ASSETS_DIRECTORY}/resources/CSE2.rc""src/ArmsItem.cpp"
"src/ArmsItem.h"
--- a/external/glad/include/glad/glad.h
+++ b/external/glad/include/glad/glad.h
@@ -86,7 +86,7 @@
GLAPI int gladLoadGLLoader(GLADloadproc);
-#include <KHR/khrplatform.h>
+#include "../KHR/khrplatform.h"
typedef unsigned int GLenum;
typedef unsigned char GLboolean;
typedef unsigned int GLbitfield;
--- a/src/Backends/Window/GLFW3-OpenGL3.cpp
+++ b/src/Backends/Window/GLFW3-OpenGL3.cpp
@@ -53,7 +53,7 @@
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)
--- a/src/Backends/Window/SDL2-OpenGL3.cpp
+++ b/src/Backends/Window/SDL2-OpenGL3.cpp
@@ -43,7 +43,7 @@
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)