eryn/base-cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use LOCAL_LIBS instead of LIBS -- fewer conflicts

Browse source
This commit is contained in:
Eryn Wells 2015-10-17 00:24:19 -07:00
parent 26eeb0874e
commit 67ab71ee8d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
site_scons/site_tools/lib.py
View file

@ -12,13 +12,13 @@ import SCons.Script
def _lib(env, name): def _lib(env, name):
return env['LIBS'].get(name) return env['LOCAL_LIBS'].get(name)
def _register_lib(env, name, lib): def _register_lib(env, name, lib):
if name in env['LIBS']: if name in env['LOCAL_LIBS']:
env.log_error('Library has already been built: {}'.format(name)) env.log_error('Library has already been built: {}'.format(name))
env['LIBS'][name] = lib env['LOCAL_LIBS'][name] = lib
def _lib_dirs(env): def _lib_dirs(env):
@ -69,7 +69,7 @@ def _build_library(env, lib_func):
# #
def generate(env): def generate(env):
env.SetDefault(LIBS={}) env.SetDefault(LOCAL_LIBS={})
env.AddMethod(_process_lib_dir, 'LibDir') env.AddMethod(_process_lib_dir, 'LibDir')
env.AddMethod(_build_library(env, env.Library), 'Library') env.AddMethod(_build_library(env, env.Library), 'Library')
env.AddMethod(_build_library(env, env.StaticLibrary), 'StaticLibrary') env.AddMethod(_build_library(env, env.StaticLibrary), 'StaticLibrary')