Skip to content

Commit

Permalink
Merge pull request #14626 from Hinsbart/module_env
Browse files Browse the repository at this point in the history
Scons: Build modules in seperate env.
  • Loading branch information
akien-mga authored Dec 13, 2017
2 parents 34e489f + 0e62423 commit 1c0007b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
10 changes: 7 additions & 3 deletions modules/bullet/SCsub
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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')
5 changes: 4 additions & 1 deletion modules/gdscript/SCsub
Original file line number Diff line number Diff line change
@@ -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')
5 changes: 4 additions & 1 deletion modules/gridmap/SCsub
Original file line number Diff line number Diff line change
@@ -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')
5 changes: 4 additions & 1 deletion modules/visual_script/SCsub
Original file line number Diff line number Diff line change
@@ -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')

0 comments on commit 1c0007b

Please sign in to comment.