diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-06-30 11:57:06 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-07-31 15:38:41 +0200 |
| commit | 601093f95ddf6b49a79baa91dc51d4f163dfc8de (patch) | |
| tree | 79cc7388e4d4de45d226852368ffcc813098b577 /src/util/SConscript | |
| parent | 1e40d2c8820e2045fbfed387a93a486c8b1c94fd (diff) | |
xmlconfig: move into src/util
v2: attempt to fix Android build (Emil)
v3: add missing include path
Reviewed-by: Marek Olšák <marek.olsak@amd.com> (v1)
Diffstat (limited to 'src/util/SConscript')
| -rw-r--r-- | src/util/SConscript | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/util/SConscript b/src/util/SConscript index 7e447f6e038..582592c203f 100644 --- a/src/util/SConscript +++ b/src/util/SConscript @@ -2,6 +2,10 @@ import common Import('*') +SConscript([ + 'xmlpool', +]) + from sys import executable as python_cmd env = env.Clone() @@ -10,6 +14,7 @@ env.MSVC2013Compat() env.Prepend(CPPPATH = [ '#include', + xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h '#src', '#src/mapi', '#src/mesa', @@ -30,10 +35,17 @@ source_lists = env.ParseSourceList('Makefile.sources') mesautil_sources = ( source_lists['MESA_UTIL_FILES'] + - source_lists['MESA_UTIL_GENERATED_FILES'] + source_lists['MESA_UTIL_GENERATED_FILES'] + + source_lists['XMLCONFIG_FILES'] ) -mesautil = env.ConvenienceLibrary( +mesautilenv = env.Clone() + +mesautilenv.AppendUnique(LIBS = [ + 'expat', +]) + +mesautil = mesautilenv.ConvenienceLibrary( target = 'mesautil', source = mesautil_sources, ) |