AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix updated glew for Windows

This commit is contained in:
Jack Andersen 2017-02-24 21:58:09 -10:00
parent 0cc794f49d
commit 8bcac27c10
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boo/graphicsdev/glew.h
View File

@ -81,6 +81,8 @@
#define __glew_h__ #define __glew_h__
#define __GLEW_H__ #define __GLEW_H__
#define GLEW_STATIC
#if defined(__gl_h_) || defined(__GL_H__) || defined(_GL_H) || defined(__X_GL_H) #if defined(__gl_h_) || defined(__GL_H__) || defined(_GL_H) || defined(__X_GL_H)
#error gl.h included before glew.h #error gl.h included before glew.h
#endif #endif

4
lib/graphicsdev/glew.c
View File

@ -38,9 +38,9 @@
#elif defined(GLEW_EGL) #elif defined(GLEW_EGL)
# include <GL/eglew.h> # include <GL/eglew.h>
#elif defined(_WIN32) #elif defined(_WIN32)
# include <GL/wglew.h> # include "boo/graphicsdev/wglew.h"
#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) #elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX))
# include <GL/glxew.h> # include "boo/graphicsdev/glxew.h"
#endif #endif
#include <stddef.h> /* For size_t */ #include <stddef.h> /* For size_t */

1
lib/win/ApplicationWin32.cpp
View File

@ -362,6 +362,7 @@ public:
int clientReturn = 0; int clientReturn = 0;
std::thread clientThread([&]() std::thread clientThread([&]()
{ {
logvisor::RegisterThreadName("Boo Client Thread");
CoInitializeEx(nullptr, COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE); CoInitializeEx(nullptr, COINIT_MULTITHREADED | COINIT_DISABLE_OLE1DDE);
clientReturn = m_callback.appMain(this); clientReturn = m_callback.appMain(this);
PostThreadMessage(g_mainThreadId, WM_USER+1, 0, 0); PostThreadMessage(g_mainThreadId, WM_USER+1, 0, 0);

1
lib/x11/ApplicationXlib.hpp
View File

@ -433,6 +433,7 @@ public:
std::unique_lock<std::mutex> innerLk(initmt); std::unique_lock<std::mutex> innerLk(initmt);
innerLk.unlock(); innerLk.unlock();
initcv.notify_one(); initcv.notify_one();
logvisor::RegisterThreadName("Boo Client Thread");
clientReturn = m_callback.appMain(this); clientReturn = m_callback.appMain(this);
pthread_kill(mainThread, SIGUSR2); pthread_kill(mainThread, SIGUSR2);
}); });