diff options
| author | Rhody Lugo <rhodylugo@gmail.com> | 2017-11-28 16:27:57 -0400 |
|---|---|---|
| committer | Rhody Lugo <rhodylugo@gmail.com> | 2017-11-28 23:24:12 -0400 |
| commit | a65c0939fd1adc616275ad01996917fab89a7b9c (patch) | |
| tree | 60fb5469a28c4ec482b8d3b9cad183daa1b654d1 /modules | |
| parent | 24baf79c5e30b75f8370c24239a00085d7ad803f (diff) | |
disable caching for targets using helper functions
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/SCsub | 3 | ||||
| -rw-r--r-- | modules/freetype/SCsub | 3 | ||||
| -rw-r--r-- | modules/gdnative/SCsub | 3 | ||||
| -rw-r--r-- | modules/recast/SCsub | 3 | ||||
| -rw-r--r-- | modules/svg/SCsub | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/modules/SCsub b/modules/SCsub index ea8b58b8c5..e3c535e981 100644 --- a/modules/SCsub +++ b/modules/SCsub @@ -17,7 +17,6 @@ for x in env.module_list: env_modules.Append(CPPFLAGS=["-DMODULE_" + x.upper() + "_ENABLED"]) SConscript(x + "/SCsub") -lib = env_modules.Library("modules", env.modules_sources) -env_modules.NoCache(lib) +lib = env_modules.add_library("modules", env.modules_sources) env.Prepend(LIBS=[lib]) diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index 9169c7d674..f69b632e76 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -68,8 +68,7 @@ if env['builtin_freetype']: if env['builtin_libpng']: env.Append(CPPPATH=["#thirdparty/libpng"]) - lib = env.Library("freetype_builtin", thirdparty_sources) - env.NoCache(lib) + lib = env.add_library("freetype_builtin", thirdparty_sources) # 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 1641d26cbf..fd11c8d094 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -248,5 +248,4 @@ if ARGUMENTS.get('gdnative_wrapper', False): if not env.msvc: gd_wrapper_env.Append(CCFLAGS=['-fPIC']) - lib = gd_wrapper_env.Library("#bin/gdnative_wrapper_code", [gensource]) - gd_wrapper_env.NoCache(lib) + lib = gd_wrapper_env.add_library("#bin/gdnative_wrapper_code", [gensource]) diff --git a/modules/recast/SCsub b/modules/recast/SCsub index 335ab6c16e..530df9a37c 100644 --- a/modules/recast/SCsub +++ b/modules/recast/SCsub @@ -24,8 +24,7 @@ if env['builtin_recast']: env.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/Include"]) - lib = env.Library("recast_builtin", thirdparty_sources) - env.NoCache(lib) + lib = env.add_library("recast_builtin", thirdparty_sources) env.Append(LIBS=[lib]) # Godot source files diff --git a/modules/svg/SCsub b/modules/svg/SCsub index 1b71fbeca4..e12abac8c1 100644 --- a/modules/svg/SCsub +++ b/modules/svg/SCsub @@ -12,8 +12,7 @@ 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) +lib = env.add_library("svg_builtin", thirdparty_sources) # 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 |