fix Linux build (only OpenCL/gwen tested)
This commit is contained in:
@@ -1171,6 +1171,7 @@ GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei heigh
|
||||
#endif /* GL_VERSION_1_1 */
|
||||
|
||||
/* ---------------------------------- GLU ---------------------------------- */
|
||||
#define GLEW_NO_GLU
|
||||
|
||||
#ifndef GLEW_NO_GLU
|
||||
/* this is where we can safely include GLU */
|
||||
|
||||
@@ -35,7 +35,7 @@ subject to the following restrictions:
|
||||
#include <GL/glu.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
//#include <GL/glu.h>
|
||||
#endif //_WINDOWS
|
||||
#endif //APPLE
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
#include "X11OpenGLWindow.h"
|
||||
#include "OpenGLInclude.h"
|
||||
|
||||
#include<stdio.h>
|
||||
#include<stdlib.h>
|
||||
#include<X11/X.h>
|
||||
#include<X11/Xlib.h>
|
||||
#include<GL/gl.h>
|
||||
#include<GL/glx.h>
|
||||
#include<GL/glu.h>
|
||||
//#include<GL/glu.h>
|
||||
|
||||
|
||||
GLint att[] = { GLX_RGBA, GLX_DEPTH_SIZE, 24, GLX_DOUBLEBUFFER, None };
|
||||
@@ -413,3 +415,9 @@ void X11OpenGLWindow::setKeyboardCallback( b3KeyboardCallback keyboardCallback)
|
||||
m_data->m_keyboardCallback = keyboardCallback;
|
||||
|
||||
}
|
||||
|
||||
b3KeyboardCallback X11OpenGLWindow::getKeyboardCallback()
|
||||
{
|
||||
return m_data->m_keyboardCallback;
|
||||
}
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@ public:
|
||||
virtual void setResizeCallback(b3ResizeCallback resizeCallback);
|
||||
virtual void setWheelCallback(b3WheelCallback wheelCallback);
|
||||
virtual void setKeyboardCallback( b3KeyboardCallback keyboardCallback);
|
||||
virtual b3KeyboardCallback getKeyboardCallback();
|
||||
|
||||
virtual void setRenderCallback( b3RenderCallback renderCallback);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user