Skip to content

Commit

Permalink
Merge pull request #1889 from rextimmy/bullet_285
Browse files Browse the repository at this point in the history
Bullet 2.85 update
  • Loading branch information
Areloch authored Dec 29, 2016
2 parents 46d81f5 + c08f75f commit 8098f8f
Show file tree
Hide file tree
Showing 395 changed files with 32,181 additions and 58,598 deletions.
27 changes: 27 additions & 0 deletions Engine/lib/bullet/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
language: cpp
os:
- linux
- osx
compiler:
- gcc
- clang
addons:
apt:
packages:
- python3

script:
- echo "CXX="$CXX
- echo "CC="$CC
- cmake . -DBUILD_PYBULLET=ON -G"Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror
- make -j8
- ctest -j8 --output-on-failure
# Build again with double precision
- cmake . -G "Unix Makefiles" -DUSE_DOUBLE_PRECISION=ON #-DCMAKE_CXX_FLAGS=-Werror
- make -j8
- ctest -j8 --output-on-failure
# Build again with shared libraries
- cmake . -G "Unix Makefiles" -DBUILD_SHARED_LIBS=ON
- make -j8
- ctest -j8 --output-on-failure
- sudo make install
22 changes: 0 additions & 22 deletions Engine/lib/bullet/AUTHORS

This file was deleted.

40 changes: 40 additions & 0 deletions Engine/lib/bullet/AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Bullet Physics is created by Erwin Coumans with contributions from the following authors / copyright holders:

AMD
Apple
Steve Baker
Gino van den Bergen
Nicola Candussi
Erin Catto
Lawrence Chai
Erwin Coumans
Christer Ericson
Disney Animation
Google
Dirk Gregorius
Marcus Hennix
MBSim Development Team
Takahiro Harada
Simon Hobbs
John Hsu
Ole Kniemeyer
Jay Lee
Francisco Leon
Vsevolod Klementjev
Phil Knight
John McCutchan
Steven Peters
Roman Ponomarev
Nathanael Presson
Gabor PUHR
Arthur Shek
Russel Smith
Sony
Jakub Stephien
Marten Svanfeldt
Pierre Terdiman
Steven Thompson
Tamas Umenhoffer
Yunfei Bai

If your name is missing, please send an email to [email protected] or file an issue at http://github.com/bulletphysics/bullet3
25 changes: 25 additions & 0 deletions Engine/lib/bullet/BulletConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# -*- cmake -*-
#
# BulletConfig.cmake(.in)
#

# Use the following variables to compile and link against Bullet:
# BULLET_FOUND - True if Bullet was found on your system
# BULLET_USE_FILE - The file making Bullet usable
# BULLET_DEFINITIONS - Definitions needed to build with Bullet
# BULLET_INCLUDE_DIR - Directory where Bullet-C-Api.h can be found
# BULLET_INCLUDE_DIRS - List of directories of Bullet and it's dependencies
# BULLET_LIBRARIES - List of libraries to link against Bullet library
# BULLET_LIBRARY_DIRS - List of directories containing Bullet' libraries
# BULLET_ROOT_DIR - The base directory of Bullet
# BULLET_VERSION_STRING - A human-readable string containing the version

set ( BULLET_FOUND 1 )
set ( BULLET_USE_FILE "@BULLET_USE_FILE@" )
set ( BULLET_DEFINITIONS "@BULLET_DEFINITIONS@" )
set ( BULLET_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@" )
set ( BULLET_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@" )
set ( BULLET_LIBRARIES "@BULLET_LIBRARIES@" )
set ( BULLET_LIBRARY_DIRS "@LIB_DESTINATION@" )
set ( BULLET_ROOT_DIR "@CMAKE_INSTALL_PREFIX@" )
set ( BULLET_VERSION_STRING "@BULLET_VERSION@" )
18 changes: 0 additions & 18 deletions Engine/lib/bullet/BulletLicense.txt

This file was deleted.

Loading

0 comments on commit 8098f8f

Please sign in to comment.