From 1b9596161703b7f08c30837917339215a2e8df63 Mon Sep 17 00:00:00 2001 From: Max Argus Date: Thu, 12 Jul 2018 20:24:15 +0200 Subject: [PATCH] fix build --- examples/OpenGLWindow/CMakeLists.txt | 2 +- examples/OpenGLWindow/MacOpenGLWindowObjC.m | 4 ++-- examples/OpenGLWindow/Win32OpenGLWindow.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/OpenGLWindow/CMakeLists.txt b/examples/OpenGLWindow/CMakeLists.txt index 4f605c1c2..0d13be556 100644 --- a/examples/OpenGLWindow/CMakeLists.txt +++ b/examples/OpenGLWindow/CMakeLists.txt @@ -44,7 +44,7 @@ IF(NOT WIN32 AND NOT APPLE) ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") ADD_DEFINITIONS("-DDYNAMIC_LOAD_X11_FUNCTIONS=1") - SET(OpenGLWindow_SRCS ${OpenGLWindowLinux_CPP} ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/glad/glx_dyn.c ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/glad/gl.c ${OpenGLWindowCommon_CPP} ) + SET(OpenGLWindow_SRCS ${OpenGLWindowLinux_CPP} ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/glad/glx.c ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/glad/gl.c ${OpenGLWindowCommon_CPP} ) ENDIF() diff --git a/examples/OpenGLWindow/MacOpenGLWindowObjC.m b/examples/OpenGLWindow/MacOpenGLWindowObjC.m index 6962bd674..09d120fd8 100644 --- a/examples/OpenGLWindow/MacOpenGLWindowObjC.m +++ b/examples/OpenGLWindow/MacOpenGLWindowObjC.m @@ -483,8 +483,8 @@ int Mac_createWindow(struct MacOpenGLWindowInternalData* m_internalData,struct M [m_internalData->m_myApp finishLaunching]; [pool release]; - if(!gladLoadGLInternalLoader()) { - printf("gladLoadGLInternalLoader failed!\n"); + if(!gladLoaderLoadGL()) { + printf("gladLoaderLoadGL failed!\n"); exit(-1); } diff --git a/examples/OpenGLWindow/Win32OpenGLWindow.cpp b/examples/OpenGLWindow/Win32OpenGLWindow.cpp index 606eba50b..24cfd3e1a 100644 --- a/examples/OpenGLWindow/Win32OpenGLWindow.cpp +++ b/examples/OpenGLWindow/Win32OpenGLWindow.cpp @@ -84,8 +84,8 @@ void Win32OpenGLWindow::createWindow(const b3gWindowConstructionInfo& ci) //VideoDriver = video::createOpenGLDriver(CreationParams, FileSystem, this); enableOpenGL(); - if(!gladLoadGLInternalLoader()) { - printf("gladLoadGLInternalLoader failed!\n"); + if(!gladLoaderLoadGL()) { + printf("gladLoaderLoadGL failed!\n"); exit(-1); }