From e141845bfb3e12a9213c8682d5b2589ce5305f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sat, 13 Jan 2018 15:16:11 +0100
Subject: SCons: Allow unbundling bullet on Linux (only 2.87+)

---
 modules/bullet/SCsub | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'modules/bullet/SCsub')

diff --git a/modules/bullet/SCsub b/modules/bullet/SCsub
index 6b1c38a265..d8d0b930a5 100644
--- a/modules/bullet/SCsub
+++ b/modules/bullet/SCsub
@@ -3,14 +3,15 @@
 Import('env')
 Import('env_modules')
 
-# build only version 2
-# Bullet 2.87
-
 env_bullet = env_modules.Clone()
 
-thirdparty_dir = "#thirdparty/bullet/"
+# Thirdparty source files
+
+if env['builtin_bullet']:
+    # Build only version 2 for now (as of 2.87)
+    thirdparty_dir = "#thirdparty/bullet/"
 
-bullet2_src = [
+    bullet2_src = [
         # BulletCollision
           "BulletCollision/BroadphaseCollision/btAxisSweep3.cpp"
         , "BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp"
@@ -181,14 +182,10 @@ bullet2_src = [
         , "LinearMath/btVector3.cpp"
     ]
 
-bullet_sources = [thirdparty_dir + file for file in bullet2_src]
+    thirdparty_sources = [thirdparty_dir + file for file in bullet2_src]
 
-# include headers
-env_bullet.Append(CPPPATH=[thirdparty_dir])
-
-env_bullet.add_source_files(env.modules_sources, bullet_sources)
+    env_bullet.add_source_files(env.modules_sources, thirdparty_sources)
+    env_bullet.Append(CPPPATH=[thirdparty_dir])
 
 # Godot source files
 env_bullet.add_source_files(env.modules_sources, "*.cpp")
-
-Export('env')
-- 
cgit v1.2.3