bullet: Streamline bundling, remove extraneous src/ folder
Document version and how to extract sources in thirdparty/README.md. Drop unnecessary CMake and Premake files. Simplify SCsub, drop unused one.
This commit is contained in:
parent
53c65ae761
commit
e12c89e8c9
|
@ -8,7 +8,9 @@ Import('env_modules')
|
|||
|
||||
env_bullet = env_modules.Clone()
|
||||
|
||||
bullet_src__2_x = [
|
||||
thirdparty_dir = "#thirdparty/bullet/"
|
||||
|
||||
bullet2_src = [
|
||||
# BulletCollision
|
||||
"BulletCollision/BroadphaseCollision/btAxisSweep3.cpp"
|
||||
, "BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp"
|
||||
|
@ -179,13 +181,10 @@ bullet_src__2_x = [
|
|||
, "LinearMath/btVector3.cpp"
|
||||
]
|
||||
|
||||
thirdparty_dir = "#thirdparty/bullet/"
|
||||
thirdparty_src = thirdparty_dir + "src/"
|
||||
|
||||
bullet_sources = [thirdparty_src + file for file in bullet_src__2_x]
|
||||
bullet_sources = [thirdparty_dir + file for file in bullet2_src]
|
||||
|
||||
# include headers
|
||||
env_bullet.Append(CPPPATH=[thirdparty_src])
|
||||
env_bullet.Append(CPPPATH=[thirdparty_dir])
|
||||
|
||||
env_bullet.add_source_files(env.modules_sources, bullet_sources)
|
||||
|
||||
|
|
|
@ -1,33 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
Import('env')
|
||||
|
||||
thirdparty_dir = "#thirdparty/bullet/"
|
||||
thirdparty_lib = thirdparty_dir + "Win64/lib/"
|
||||
|
||||
bullet_libs = [
|
||||
"Bullet2FileLoader",
|
||||
"Bullet3Collision",
|
||||
"Bullet3Common",
|
||||
"Bullet3Dynamics",
|
||||
"Bullet3Geometry",
|
||||
"Bullet3OpenCL_clew",
|
||||
"BulletCollision",
|
||||
"BulletDynamics",
|
||||
"BulletInverseDynamics",
|
||||
"BulletSoftBody",
|
||||
"LinearMath"
|
||||
]
|
||||
|
||||
thirdparty_src = thirdparty_dir + "src/"
|
||||
# include headers
|
||||
env.Append(CPPPATH=[thirdparty_src])
|
||||
|
||||
# lib
|
||||
env.Append(LIBPATH=[thirdparty_dir + "/Win64/lib/"])
|
||||
|
||||
bullet_libs = [file+'.lib' for file in bullet_libs]
|
||||
# LIBS doesn't work in windows
|
||||
env.Append(LINKFLAGS=bullet_libs)
|
||||
|
||||
env.add_source_files(env.modules_sources, "*.cpp")
|
|
@ -8,6 +8,18 @@
|
|||
- License: zlib
|
||||
|
||||
|
||||
## bullet
|
||||
|
||||
- Upstream: https://github.com/bulletphysics/bullet3
|
||||
- Version: git (d05ad4b, 2017)
|
||||
- License: zlib
|
||||
|
||||
Files extracted from upstream source:
|
||||
|
||||
- src/* apart from CMakeLists.txt and premake4.lua files
|
||||
- LICENSE.txt
|
||||
|
||||
|
||||
## certs
|
||||
|
||||
- Upstream: ?
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue