Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x86 libs for msw v120 #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −18
Open

x86 libs for msw v120 #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14e4f93
x86 libs for msv v120
fumarioso Oct 10, 2014
6fef307
Additional #include paths
fumarioso Oct 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added lib/msw/x86/BulletCollision-v120.lib
View file
Binary file not shown.
Binary file added lib/msw/x86/BulletCollision-v120_d.lib
View file
Binary file not shown.
Binary file added lib/msw/x86/BulletDynamics-v120.lib
View file
Binary file not shown.
Binary file added lib/msw/x86/BulletDynamics-v120_d.lib
View file
Binary file not shown.
Binary file added lib/msw/x86/BulletSoftBody-v120.lib
View file
Binary file not shown.
Binary file added lib/msw/x86/BulletSoftBody-v120_d.lib
View file
Binary file not shown.
Binary file added lib/msw/x86/LinearMath-v120.lib
View file
Binary file not shown.
Binary file added lib/msw/x86/LinearMath-v120_d.lib
View file
Binary file not shown.
Binary file added lib/msw/x86/bulletcollision-v120_d.pdb
View file
Binary file not shown.
Binary file added lib/msw/x86/bulletdynamics-v120_d.pdb
View file
Binary file not shown.
Binary file added lib/msw/x86/bulletsoftbody-v120_d.pdb
View file
Binary file not shown.
Binary file added lib/msw/x86/linearmath-v120_d.pdb
View file
Binary file not shown.
9 changes: 4 additions & 5 deletions samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -63,7 +64,7 @@
<AdditionalIncludeDirectories>"..\..\..\..\..\\include";..\include</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>cinder-$(PlatformToolset)_d.lib;%(AdditionalDependencies);..\..\..\lib\msw\x86\BulletCollision-v110_d.lib;..\..\..\lib\msw\x86\BulletDynamics-v110_d.lib;..\..\..\lib\msw\x86\BulletSoftBody-v110_d.lib;..\..\..\lib\msw\x86\LinearMath-v110_d.lib</AdditionalDependencies>
<AdditionalDependencies>cinder-$(PlatformToolset)_d.lib;%(AdditionalDependencies);..\..\..\lib\msw\x86\BulletCollision-v120_d.lib;..\..\..\lib\msw\x86\BulletDynamics-v120_d.lib;..\..\..\lib\msw\x86\BulletSoftBody-v120_d.lib;..\..\..\lib\msw\x86\LinearMath-v120_d.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>"..\..\..\..\..\\lib\msw\$(PlatformTarget)"</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -90,7 +91,7 @@
<AdditionalIncludeDirectories>"..\..\..\..\..\\include";..\include</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>cinder-$(PlatformToolset).lib;%(AdditionalDependencies);..\..\..\lib\msw\x86\BulletCollision-v110.lib;..\..\..\lib\msw\x86\BulletDynamics-v110.lib;..\..\..\lib\msw\x86\BulletSoftBody-v110.lib;..\..\..\lib\msw\x86\LinearMath-v110.lib</AdditionalDependencies>
<AdditionalDependencies>cinder-$(PlatformToolset).lib;%(AdditionalDependencies);..\..\..\lib\msw\x86\BulletCollision-v120.lib;..\..\..\lib\msw\x86\BulletDynamics-v120.lib;..\..\..\lib\msw\x86\BulletSoftBody-v120.lib;..\..\..\lib\msw\x86\LinearMath-v120.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>"..\..\..\..\..\\lib\msw\$(PlatformTarget)"</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
@@ -108,7 +109,6 @@
<ItemGroup>
<ClCompile Include="..\src\PhysicsPrimitivesApp.cpp" />
<ClCompile Include="..\..\..\src\Cinder-Bullet3D\BulletContext.cpp" />
<ClCompile Include="..\..\..\src\Cinder-Bullet3D\CollisionObject.cpp" />
<ClCompile Include="..\..\..\src\Cinder-Bullet3D\Common.cpp" />
<ClCompile Include="..\..\..\src\Cinder-Bullet3D\ConstraintBase.cpp" />
<ClCompile Include="..\..\..\src\Cinder-Bullet3D\ConstraintConeTwist.cpp" />
@@ -330,7 +330,6 @@
<ClInclude Include="..\..\..\src\BulletPhysics\vectormath\sse\vectormath_aos.h" />
<ClInclude Include="..\..\..\src\BulletPhysics\vectormath\vmInclude.h" />
<ClInclude Include="..\..\..\src\Cinder-Bullet3D\BulletContext.h" />
<ClInclude Include="..\..\..\src\Cinder-Bullet3D\CollisionObject.h" />
<ClInclude Include="..\..\..\src\Cinder-Bullet3D\Common.h" />
<ClInclude Include="..\..\..\src\Cinder-Bullet3D\ConstraintBase.h" />
<ClInclude Include="..\..\..\src\Cinder-Bullet3D\ConstraintConeTwist.h" />
@@ -478,4 +477,4 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
</Project>
9 changes: 2 additions & 7 deletions samples/PhysicsPrimitives/vc2013/PhysicsPrimitives.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
@@ -713,9 +714,6 @@
<ClInclude Include="..\..\..\src\Cinder-Bullet3D\BulletContext.h">
<Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Cinder-Bullet3D\CollisionObject.h">
<Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Cinder-Bullet3D\Common.h">
<Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
</ClInclude>
@@ -1151,9 +1149,6 @@
<ClCompile Include="..\..\..\src\Cinder-Bullet3D\BulletContext.cpp">
<Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Cinder-Bullet3D\CollisionObject.cpp">
<Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Cinder-Bullet3D\Common.cpp">
<Filter>Blocks\Bullet 3D Physics\src\Cinder-Bullet3D</Filter>
</ClCompile>
@@ -1198,4 +1193,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>
8 changes: 4 additions & 4 deletions src/Cinder-Bullet3D/Common.cpp
View file
Original file line number Diff line number Diff line change
@@ -14,10 +14,10 @@
#include "cinder/gl/VboMesh.h"
#include "cinder/GeomIo.h"

#include "btHeightfieldTerrainShape.h"
#include "btConvexShape.h"
#include "btCollisionShape.h"
#include "btSoftBody.h"
#include "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h"
#include "BulletCollision/CollisionShapes/btConvexShape.h"
#include "BulletCollision/CollisionShapes/btCollisionShape.h"
#include "BulletSoftBody/btSoftBody.h"


using namespace ci;
5 changes: 4 additions & 1 deletion src/Cinder-Bullet3D/Common.h
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,10 @@

#include "btBulletCollisionCommon.h"
#include "btBulletDynamicsCommon.h"
#include "btSoftRigidDynamicsWorld.h"
#include "BulletSoftBody/btSoftRigidDynamicsWorld.h"
#include <map>
#include "cinder/Channel.h"
#include "cinder/gl/VboMesh.h"

#include "cinder/Log.h"

5 changes: 5 additions & 0 deletions src/Cinder-Bullet3D/Conversions.hpp
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,11 @@

#pragma once

#include "cinder/Quaternion.h"
#include "cinder/Vector.h"
#include "cinder/Matrix.h"
#include "cinder/TriMesh.h"

namespace bullet {

// Beginning Conversion from type to type
2 changes: 1 addition & 1 deletion src/Cinder-Bullet3D/RigidBody.cpp
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
#include "Cinder-Bullet3D/RigidBody.h"
#include "Cinder-Bullet3D/Common.h"
#include "Cinder-Bullet3D/BulletContext.h"
#include "btCollisionObject.h"
#include "BulletCollision/CollisionDispatch/btCollisionObject.h"

using namespace ci;