disable caching for targets using helper functions

This commit is contained in:
Rhody Lugo 2017-11-28 16:27:57 -04:00
parent 24baf79c5e
commit a65c0939fd
24 changed files with 45 additions and 50 deletions

View file

@ -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])

View file

@ -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")

View file

@ -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])

View file

@ -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

View file

@ -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