diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-28 13:29:52 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-28 14:07:39 +0200 |
commit | 3a2ca68af3c8bafe9f60f09bd8fece894fe3a925 (patch) | |
tree | c33aa8ccee82b26d868fbc91abed94e2480864c2 /scene/SCsub | |
parent | 243bdc4524ddcf8ac6bef03c378e14fe7bb263b8 (diff) |
SCons: Build thirdparty code in own env, disable warnings
Also remove unnecessary `Export('env')` in other SCsubs,
Export should only be used when exporting *new* objects.
Diffstat (limited to 'scene/SCsub')
-rw-r--r-- | scene/SCsub | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scene/SCsub b/scene/SCsub index 5d81e818ba..b1892acabc 100644 --- a/scene/SCsub +++ b/scene/SCsub @@ -4,7 +4,6 @@ Import('env') env.scene_sources = [] - # Thirdparty code thirdparty_dir = "#thirdparty/misc/" thirdparty_sources = [ @@ -12,8 +11,10 @@ thirdparty_sources = [ "mikktspace.c", ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] -env.add_source_files(env.scene_sources, thirdparty_sources) +env_thirdparty = env.Clone() +env_thirdparty.disable_warnings() +env_thirdparty.add_source_files(env.scene_sources, thirdparty_sources) # Godot's own sources env.add_source_files(env.scene_sources, "*.cpp") @@ -32,5 +33,3 @@ SConscript('resources/SCsub') # Build it all as a library lib = env.add_library("scene", env.scene_sources) env.Prepend(LIBS=[lib]) - -Export('env') |