diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-13 14:43:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-13 14:43:30 +0100 |
| commit | a3ee252993e8200c856be3fe664937f9461ee268 (patch) | |
| tree | af68e434545e20c538f896e28b73f2db7d626edd /modules | |
| parent | c01575b3125ce1828f0cacb3f9f00286136f373c (diff) | |
| parent | e12c89e8c9896b2e5cdd70dbd2d2acb449ff4b94 (diff) | |
Merge pull request #15664 from akien-mga/thirdparty
Bugfix updates to various thirdparty libraries
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bullet/SCsub | 11 | ||||
| -rw-r--r-- | modules/bullet/SCsub_with_lib | 33 |
2 files changed, 5 insertions, 39 deletions
diff --git a/modules/bullet/SCsub b/modules/bullet/SCsub index 0967bca3f2..6b1c38a265 100644 --- a/modules/bullet/SCsub +++ b/modules/bullet/SCsub @@ -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) diff --git a/modules/bullet/SCsub_with_lib b/modules/bullet/SCsub_with_lib deleted file mode 100644 index b362a686ff..0000000000 --- a/modules/bullet/SCsub_with_lib +++ /dev/null @@ -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") |