Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix Linux build (only OpenCL/gwen tested)

Browse Source
This commit is contained in:
erwincoumans
2013-05-20 16:53:43 -07:00
parent 4877a2af8a
commit 453952f202
7 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
btgui/OpenGLWindow/GlewWindows/GL/glew.h
View File

@@ -1171,6 +1171,7 @@ GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei heigh
#endif /* GL_VERSION_1_1 */ #endif /* GL_VERSION_1_1 */
/* ---------------------------------- GLU ---------------------------------- */ /* ---------------------------------- GLU ---------------------------------- */
#define GLEW_NO_GLU
#ifndef GLEW_NO_GLU #ifndef GLEW_NO_GLU
/* this is where we can safely include GLU */ /* this is where we can safely include GLU */

2
btgui/OpenGLWindow/OpenGLInclude.h
View File

@@ -35,7 +35,7 @@ subject to the following restrictions:
#include <GL/glu.h> #include <GL/glu.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> //#include <GL/glu.h>
#endif //_WINDOWS #endif //_WINDOWS
#endif //APPLE #endif //APPLE

10
btgui/OpenGLWindow/X11OpenGLWindow.cpp
View File

@@ -1,11 +1,13 @@
#include "X11OpenGLWindow.h" #include "X11OpenGLWindow.h"
#include "OpenGLInclude.h"
#include<stdio.h> #include<stdio.h>
#include<stdlib.h> #include<stdlib.h>
#include<X11/X.h> #include<X11/X.h>
#include<X11/Xlib.h> #include<X11/Xlib.h>
#include<GL/gl.h> #include<GL/gl.h>
#include<GL/glx.h> #include<GL/glx.h>
#include<GL/glu.h> //#include<GL/glu.h>
GLint att[] = { GLX_RGBA, GLX_DEPTH_SIZE, 24, GLX_DOUBLEBUFFER, None }; 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; m_data->m_keyboardCallback = keyboardCallback;
} }
b3KeyboardCallback X11OpenGLWindow::getKeyboardCallback()
{
return m_data->m_keyboardCallback;
}

1
btgui/OpenGLWindow/X11OpenGLWindow.h
View File

@@ -52,6 +52,7 @@ public:
virtual void setResizeCallback(b3ResizeCallback resizeCallback); virtual void setResizeCallback(b3ResizeCallback resizeCallback);
virtual void setWheelCallback(b3WheelCallback wheelCallback); virtual void setWheelCallback(b3WheelCallback wheelCallback);
virtual void setKeyboardCallback( b3KeyboardCallback keyboardCallback); virtual void setKeyboardCallback( b3KeyboardCallback keyboardCallback);
virtual b3KeyboardCallback getKeyboardCallback();
virtual void setRenderCallback( b3RenderCallback renderCallback); virtual void setRenderCallback( b3RenderCallback renderCallback);

8
build/findOpenGLGlewGlut.lua
View File

@@ -42,7 +42,13 @@
files { projectRootDir .. "btgui/OpenGLWindow/GlewWindows/glew.c"} files { projectRootDir .. "btgui/OpenGLWindow/GlewWindows/glew.c"}
end end
if os.is("Linux") then if os.is("Linux") then
links{"GLEW"} --links{"GLEW"}
defines { "GLEW_STATIC"}
includedirs {
projectRootDir .. "btgui/OpenGLWindow/GlewWindows"
}
files { projectRootDir .. "btgui/OpenGLWindow/GlewWindows/glew.c"}
end end
configuration{} configuration{}
end end

6
src/Bullet3Common/b3QuadWord.h
View File

@@ -68,7 +68,11 @@ public:
mVec128 = v128; mVec128 = v128;
} }
#else #else
b3Scalar m_floats[4]; union
{
b3Scalar m_floats[4];
struct {b3Scalar x,y,z,w;};
};
#endif // B3_USE_SSE #endif // B3_USE_SSE
#endif //__CELLOS_LV2__ __SPU__ #endif //__CELLOS_LV2__ __SPU__

6
src/Bullet3Common/b3Vector3.h
View File

@@ -106,7 +106,11 @@ public:
mVec128 = v128; mVec128 = v128;
} }
#else #else
b3Scalar m_floats[4]; union
{
b3Scalar m_floats[4];
struct {b3Scalar x,y,z,w;};
};
#endif #endif
#endif //__CELLOS_LV2__ __SPU__ #endif //__CELLOS_LV2__ __SPU__