diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-13 16:57:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-13 16:57:12 +0100 |
| commit | 1c0007ba71bfc1d42213e9feaa0ab3a867f2e163 (patch) | |
| tree | abf119d5b9dabef5e218721cdc4ee87e4f381425 /modules | |
| parent | 34e489f060ab0d60ebff0bb261db967eecbe6544 (diff) | |
| parent | 0e624234daaecbe5dee6bcaa37d7af21896e8bf6 (diff) | |
Merge pull request #14626 from Hinsbart/module_env
Scons: Build modules in seperate env.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bullet/SCsub | 10 | ||||
| -rw-r--r-- | modules/gdscript/SCsub | 5 | ||||
| -rw-r--r-- | modules/gridmap/SCsub | 5 | ||||
| -rw-r--r-- | modules/visual_script/SCsub | 5 |
4 files changed, 19 insertions, 6 deletions
diff --git a/modules/bullet/SCsub b/modules/bullet/SCsub index 7a37cca130..0967bca3f2 100644 --- a/modules/bullet/SCsub +++ b/modules/bullet/SCsub @@ -1,9 +1,13 @@ #!/usr/bin/env python Import('env') +Import('env_modules') # build only version 2 # Bullet 2.87 + +env_bullet = env_modules.Clone() + bullet_src__2_x = [ # BulletCollision "BulletCollision/BroadphaseCollision/btAxisSweep3.cpp" @@ -181,11 +185,11 @@ thirdparty_src = thirdparty_dir + "src/" bullet_sources = [thirdparty_src + file for file in bullet_src__2_x] # include headers -env.Append(CPPPATH=[thirdparty_src]) +env_bullet.Append(CPPPATH=[thirdparty_src]) -env.add_source_files(env.modules_sources, bullet_sources) +env_bullet.add_source_files(env.modules_sources, bullet_sources) # Godot source files -env.add_source_files(env.modules_sources, "*.cpp") +env_bullet.add_source_files(env.modules_sources, "*.cpp") Export('env') diff --git a/modules/gdscript/SCsub b/modules/gdscript/SCsub index 0882406761..13870170a5 100644 --- a/modules/gdscript/SCsub +++ b/modules/gdscript/SCsub @@ -1,7 +1,10 @@ #!/usr/bin/env python Import('env') +Import('env_modules') -env.add_source_files(env.modules_sources, "*.cpp") +env_gdscript = env_modules.Clone() + +env_gdscript.add_source_files(env.modules_sources, "*.cpp") Export('env') diff --git a/modules/gridmap/SCsub b/modules/gridmap/SCsub index 0882406761..2ffe15cd33 100644 --- a/modules/gridmap/SCsub +++ b/modules/gridmap/SCsub @@ -1,7 +1,10 @@ #!/usr/bin/env python Import('env') +Import('env_modules') -env.add_source_files(env.modules_sources, "*.cpp") +env_gridmap = env_modules.Clone() + +env_gridmap.add_source_files(env.modules_sources, "*.cpp") Export('env') diff --git a/modules/visual_script/SCsub b/modules/visual_script/SCsub index 0882406761..96ee911ba0 100644 --- a/modules/visual_script/SCsub +++ b/modules/visual_script/SCsub @@ -1,7 +1,10 @@ #!/usr/bin/env python Import('env') +Import('env_modules') -env.add_source_files(env.modules_sources, "*.cpp") +env_vs = env_modules.Clone() + +env_vs.add_source_files(env.modules_sources, "*.cpp") Export('env') |