Prechádzať zdrojové kódy

Merge pull request #14626 from Hinsbart/module_env

Scons: Build modules in seperate env.
Rémi Verschelde 7 rokov pred
rodič
commit
1c0007ba71

+ 7 - 3
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')

+ 4 - 1
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')

+ 4 - 1
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')

+ 4 - 1
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')