Merge pull request #15664 from akien-mga/thirdparty

Bugfix updates to various thirdparty libraries

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)
 

modules/bullet/SCsub_with_lib

@@ -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")

thirdparty/README.md

@@ -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: ?
@@ -108,7 +120,7 @@ Files extracted from upstream source:
 ## libogg
 
 - Upstream: https://www.xiph.org/ogg
-- Version: 1.3.2
+- Version: 1.3.3
 - License: BSD-3-Clause
 
 Files extracted from upstream source:
@@ -327,7 +339,7 @@ Files extracted from the upstream source:
 ## openssl
 
 - Upstream: https://www.openssl.org
-- Version: 1.0.2l
+- Version: 1.0.2n
 - License: OpenSSL license / BSD-like
 
 Files extracted from the upstream source:
@@ -344,11 +356,14 @@ Files extracted from the upstream source:
     -o -name "*.gcc" -o -name "*.in" -o -name "*.lnx" -o -name "*.m4" \
     -o -name "*.pl" -o -name "*.pod" -o -name "*.s" -o -name "*.sh" \
     -o -name "*.sol" -o -name "*test*" \) -delete
-  cd openssl; for file in *.h; do find ../{crypto,ssl} -name "$file" -delete; done
+  cd openssl; for file in *.h; do find ../{crypto,ssl} -name "$file" -delete; done; cd ..
   ```
   For the rest check the `git status` and decide.
 - e_os.h
-- Apply the Godot-specific patches in the `patches/` folder.
+- MacOS/buildinf.h
+- LICENSE
+- Apply the Godot-specific patches in the `patches/` folder
+  (make sure not to commit .orig/.rej files generated by `patch`)
 
 
 ## opus
@@ -428,7 +443,7 @@ comments and a patch is provided in the squish/ folder.
 ## tinyexr
 
 - Upstream: https://github.com/syoyo/tinyexr
-- Version: 0.9.5+ (git 9f784ca - 24 October 2017)
+- Version: git (e385dad, 2018)
 - License: BSD-3-Clause
 
 Files extracted from upstream source:
@@ -450,10 +465,10 @@ Files extracted from upstream source:
 ## zstd
 
 - Upstream: https://github.com/facebook/zstd
-- Version: 1.3.2
+- Version: 1.3.3
 - License: BSD-3-Clause
 
 Files extracted from upstream source:
 
 - lib/{common/,compress/,decompress/,zstd.h}
-- README.md, LICENSE
+- LICENSE