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

fix Linux build

Browse Source
This commit is contained in:
Erwin Coumans
2013-08-22 17:49:59 -07:00
parent d860e7f51a
commit 74948ede54
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Demos3/GpuDemos/premake4.lua
View File

@@ -74,6 +74,7 @@ function createProject(vendor)
} }
end end
if os.is("Linux") then if os.is("Linux") then
links{"X11"}
files { files {
"../../btgui/OpenGLWindow/X11OpenGLWindow.cpp", "../../btgui/OpenGLWindow/X11OpenGLWindow.cpp",
"../../btgui/OpenGLWindow/X11OpenGLWindows.h" "../../btgui/OpenGLWindow/X11OpenGLWindows.h"

1
Demos3/GpuGuiInitialize/premake4.lua
View File

@@ -68,6 +68,7 @@ function createProject(vendor)
} }
end end
if os.is("Linux") then if os.is("Linux") then
links {"X11"}
files { files {
"../../btgui/OpenGLWindow/X11OpenGLWindow.cpp", "../../btgui/OpenGLWindow/X11OpenGLWindow.cpp",
"../../btgui/OpenGLWindow/X11OpenGLWindows.h" "../../btgui/OpenGLWindow/X11OpenGLWindows.h"

1
btgui/GwenOpenGLTest/premake4.lua
View File

@@ -56,6 +56,7 @@
} }
end end
if os.is("Linux") then if os.is("Linux") then
links ("X11")
files{ files{
"../OpenGLWindow/X11OpenGLWindow.h", "../OpenGLWindow/X11OpenGLWindow.h",
"../OpenGLWindow/X11OpenGLWindow.cpp" "../OpenGLWindow/X11OpenGLWindow.cpp"

1
btgui/OpenGLTrueTypeFont/premake4.lua
View File

@@ -46,6 +46,7 @@
} }
end end
if os.is("Linux") then if os.is("Linux") then
links{"X11"}
files{ files{
"../OpenGLWindow/X11OpenGLWindow.h", "../OpenGLWindow/X11OpenGLWindow.h",
"../OpenGLWindow/X11OpenGLWindow.cpp" "../OpenGLWindow/X11OpenGLWindow.cpp"

2
src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h
View File

@@ -18,7 +18,7 @@ subject to the following restrictions:
#include "Bullet3Common/b3Scalar.h" #include "Bullet3Common/b3Scalar.h"
#include "Bullet3Common/b3Matrix3x3.h" #include "Bullet3Common/b3Matrix3x3.h"
#include "Bullet3Collision/NarrowPhaseCollision/Shared/b3RigidBodyData.h" #include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
B3_ATTRIBUTE_ALIGNED16(struct) b3RigidBodyCL : public b3RigidBodyData B3_ATTRIBUTE_ALIGNED16(struct) b3RigidBodyCL : public b3RigidBodyData

23
src/Bullet3Common/b3Vector3.h
View File

@@ -75,10 +75,15 @@ const int32x4_t B3_ATTRIBUTE_ALIGNED16(b3v3AbsMask) = (int32x4_t){0x7FFFFFFF, 0x
class b3Vector3; class b3Vector3;
class b3Vector4; class b3Vector4;
inline b3Vector3 b3MakeVector3( b3SimdFloat4 v);
#if defined(B3_USE_SSE_IN_API) && defined (B3_USE_SSE)
//#if defined (B3_USE_SSE) || defined (B3_USE_NEON)
inline b3Vector3 b3MakeVector3( b3SimdFloat3 v);
inline b3Vector4 b3MakeVector4(b3SimdFloat4 vec);
#endif
inline b3Vector3 b3MakeVector3(b3Scalar x,b3Scalar y,b3Scalar z); inline b3Vector3 b3MakeVector3(b3Scalar x,b3Scalar y,b3Scalar z);
inline b3Vector3 b3MakeVector3(b3Scalar x,b3Scalar y,b3Scalar z, b3Scalar w); inline b3Vector3 b3MakeVector3(b3Scalar x,b3Scalar y,b3Scalar z, b3Scalar w);
inline b3Vector4 b3MakeVector4(b3SimdFloat4 vec);
inline b3Vector4 b3MakeVector4(b3Scalar x,b3Scalar y,b3Scalar z,b3Scalar w); inline b3Vector4 b3MakeVector4(b3Scalar x,b3Scalar y,b3Scalar z,b3Scalar w);
@@ -1289,12 +1294,6 @@ B3_FORCE_INLINE void b3Vector3::deSerialize(const struct b3Vector3Data& dataIn)
} }
inline b3Vector3 b3MakeVector3( b3SimdFloat4 v)
{
b3Vector3 tmp;
tmp.set128(v);
return tmp;
}
inline b3Vector3 b3MakeVector3(b3Scalar x,b3Scalar y,b3Scalar z) inline b3Vector3 b3MakeVector3(b3Scalar x,b3Scalar y,b3Scalar z)
@@ -1320,6 +1319,14 @@ inline b3Vector4 b3MakeVector4(b3Scalar x,b3Scalar y,b3Scalar z,b3Scalar w)
} }
#if defined(B3_USE_SSE_IN_API) && defined (B3_USE_SSE) #if defined(B3_USE_SSE_IN_API) && defined (B3_USE_SSE)
inline b3Vector3 b3MakeVector3( b3SimdFloat4 v)
{
b3Vector3 tmp;
tmp.set128(v);
return tmp;
}
inline b3Vector4 b3MakeVector4(b3SimdFloat4 vec) inline b3Vector4 b3MakeVector4(b3SimdFloat4 vec)
{ {
b3Vector4 tmp; b3Vector4 tmp;