diff options
| author | Rhody Lugo <rhodylugo@gmail.com> | 2017-11-27 09:39:05 -0400 |
|---|---|---|
| committer | Rhody Lugo <rhodylugo@gmail.com> | 2017-11-28 03:23:33 -0400 |
| commit | a4a222d62dcffaf93e3dd439c3f61836a4cd831e (patch) | |
| tree | 72f06c4b4a0aaa17aa9108bc12f20d057b671151 /modules | |
| parent | a26b36bec2e99a128b7a61ff9fa1e2e46148f547 (diff) | |
use the same cache for all branches for appveyor
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/SCsub | 1 | ||||
| -rw-r--r-- | modules/freetype/SCsub | 1 | ||||
| -rw-r--r-- | modules/gdnative/SCsub | 3 | ||||
| -rw-r--r-- | modules/recast/SCsub | 1 | ||||
| -rw-r--r-- | modules/svg/SCsub | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/modules/SCsub b/modules/SCsub index c1cf5a6c1a..ea8b58b8c5 100644 --- a/modules/SCsub +++ b/modules/SCsub @@ -18,5 +18,6 @@ for x in env.module_list: SConscript(x + "/SCsub") lib = env_modules.Library("modules", env.modules_sources) +env_modules.NoCache(lib) env.Prepend(LIBS=[lib]) diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index 19e384af73..9169c7d674 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -69,6 +69,7 @@ if env['builtin_freetype']: env.Append(CPPPATH=["#thirdparty/libpng"]) lib = env.Library("freetype_builtin", thirdparty_sources) + env.NoCache(lib) # Needs to be appended to arrive after libscene in the linker call, # but we don't want it to arrive *after* system libs, so manual hack # LIBS contains first SCons Library objects ("SCons.Node.FS.File object") diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index f5a593cf4e..1641d26cbf 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -248,4 +248,5 @@ if ARGUMENTS.get('gdnative_wrapper', False): if not env.msvc: gd_wrapper_env.Append(CCFLAGS=['-fPIC']) - gd_wrapper_env.Library("#bin/gdnative_wrapper_code", [gensource]) + lib = gd_wrapper_env.Library("#bin/gdnative_wrapper_code", [gensource]) + gd_wrapper_env.NoCache(lib) diff --git a/modules/recast/SCsub b/modules/recast/SCsub index 500c0ec055..335ab6c16e 100644 --- a/modules/recast/SCsub +++ b/modules/recast/SCsub @@ -25,6 +25,7 @@ if env['builtin_recast']: env.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/Include"]) lib = env.Library("recast_builtin", thirdparty_sources) + env.NoCache(lib) env.Append(LIBS=[lib]) # Godot source files diff --git a/modules/svg/SCsub b/modules/svg/SCsub index 5be9367808..1b71fbeca4 100644 --- a/modules/svg/SCsub +++ b/modules/svg/SCsub @@ -13,6 +13,8 @@ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] # env.add_source_files(env.modules_sources, thirdparty_sources) lib = env.Library("svg_builtin", thirdparty_sources) +env.NoCache(lib) + # Needs to be appended to arrive after libscene in the linker call, # but we don't want it to arrive *after* system libs, so manual hack # LIBS contains first SCons Library objects ("SCons.Node.FS.File object") |