diff options
Diffstat (limited to 'src/gallium/drivers/swr/SConscript')
| -rw-r--r-- | src/gallium/drivers/swr/SConscript | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript index 512269afbef..cdfb91a5bba 100644 --- a/src/gallium/drivers/swr/SConscript +++ b/src/gallium/drivers/swr/SConscript @@ -30,12 +30,6 @@ else: llvm_includedir = env.backtick('%s --includedir' % llvm_config).rstrip() print "llvm include dir %s" % llvm_includedir -# the loader is included in the mesa lib itself -# All the remaining files are in loadable modules -loadersource = env.ParseSourceList('Makefile.sources', [ - 'LOADER_SOURCES' -]) - if not env['msvc'] : env.Append(CCFLAGS = [ '-std=c++11', @@ -191,16 +185,12 @@ built_sources += [backendPixelRateFiles, genRasterizerFiles] source = built_sources source += env.ParseSourceList(swrroot + 'Makefile.sources', [ - 'CXX_SOURCES', 'ARCHRAST_CXX_SOURCES', 'COMMON_CXX_SOURCES', 'CORE_CXX_SOURCES', - 'JITTER_CXX_SOURCES', 'MEMORY_CXX_SOURCES' ]) -env.Prepend(LIBS = [ mesautil, mesa, gallium ]) - env.Prepend(CPPPATH = [ '.', 'rasterizer', @@ -242,14 +232,24 @@ swrAVX2 = envavx2.SharedLibrary( ) env.Alias('swrAVX2', swrAVX2) +source = env.ParseSourceList(swrroot + 'Makefile.sources', [ + 'CXX_SOURCES', + 'COMMON_CXX_SOURCES', + 'JITTER_CXX_SOURCES', + 'LOADER_SOURCES' +]) +source += [ + 'rasterizer/codegen/gen_knobs.cpp', + 'rasterizer/archrast/gen_ar_event.cpp', + ] # main SWR lib -swr = env.ConvenienceLibrary( +envSWR = envavx.Clone() # pick up the arch flag for intrinsic usage +swr = envSWR.ConvenienceLibrary( target = 'swr', - source = loadersource, + source = source, ) - # treat arch libs as dependencies, even though they are not linked # into swr, so we don't have to build them separately Depends(swr, ['swrAVX', 'swrAVX2']) |