Fixes
This commit is contained in:
parent
85e1afb35a
commit
30c7967ed4
4 changed files with 4 additions and 4 deletions
|
@ -33,7 +33,7 @@ option(FORCE_LOCAL_LIBS "Compile the built-in versions of SDL2, FreeType, and FL
|
||||||
|
|
||||||
project(CSE2 LANGUAGES C CXX)
|
project(CSE2 LANGUAGES C CXX)
|
||||||
|
|
||||||
add_executable(CSE2 WIN32
|
add_executable(CSE2
|
||||||
"${ASSETS_DIRECTORY}/resources/CSE2.rc"
|
"${ASSETS_DIRECTORY}/resources/CSE2.rc"
|
||||||
"src/ArmsItem.cpp"
|
"src/ArmsItem.cpp"
|
||||||
"src/ArmsItem.h"
|
"src/ArmsItem.h"
|
||||||
|
|
2
external/glad/include/glad/glad.h
vendored
2
external/glad/include/glad/glad.h
vendored
|
@ -86,7 +86,7 @@ GLAPI int gladLoadGL(void);
|
||||||
|
|
||||||
GLAPI int gladLoadGLLoader(GLADloadproc);
|
GLAPI int gladLoadGLLoader(GLADloadproc);
|
||||||
|
|
||||||
#include <KHR/khrplatform.h>
|
#include "../KHR/khrplatform.h"
|
||||||
typedef unsigned int GLenum;
|
typedef unsigned int GLenum;
|
||||||
typedef unsigned char GLboolean;
|
typedef unsigned char GLboolean;
|
||||||
typedef unsigned int GLbitfield;
|
typedef unsigned int GLbitfield;
|
||||||
|
|
|
@ -53,7 +53,7 @@ BOOL WindowBackend_OpenGL_CreateWindow(const char *window_title, int *screen_wid
|
||||||
glfwMakeContextCurrent(window);
|
glfwMakeContextCurrent(window);
|
||||||
|
|
||||||
#ifndef USE_OPENGLES2
|
#ifndef USE_OPENGLES2
|
||||||
if (gladLoadGLLoader(glfwGetProcAddress))
|
if (gladLoadGLLoader((GLADloadproc)glfwGetProcAddress))
|
||||||
{
|
{
|
||||||
// Check if the platform supports OpenGL 3.2
|
// Check if the platform supports OpenGL 3.2
|
||||||
if (GLAD_GL_VERSION_3_2)
|
if (GLAD_GL_VERSION_3_2)
|
||||||
|
|
|
@ -43,7 +43,7 @@ BOOL WindowBackend_OpenGL_CreateWindow(const char *window_title, int *screen_wid
|
||||||
if (SDL_GL_MakeCurrent(window, context) == 0)
|
if (SDL_GL_MakeCurrent(window, context) == 0)
|
||||||
{
|
{
|
||||||
#ifndef USE_OPENGLES2
|
#ifndef USE_OPENGLES2
|
||||||
if (gladLoadGLLoader(SDL_GL_GetProcAddress))
|
if (gladLoadGLLoader((GLADloadproc)SDL_GL_GetProcAddress))
|
||||||
{
|
{
|
||||||
// Check if the platform supports OpenGL 3.2
|
// Check if the platform supports OpenGL 3.2
|
||||||
if (GLAD_GL_VERSION_3_2)
|
if (GLAD_GL_VERSION_3_2)
|
||||||
|
|
Loading…
Add table
Reference in a new issue