--- src/gallium/targets/libgl-gdi/SConscript | 6 ++++++ src/gallium/targets/libgl-xlib/SConscript | 6 ++++++ src/gallium/targets/osmesa/SConscript | 6 ++++++ 3 files changed, 18 insertions(+)
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript index 2a52363..0cedc8b 100644 --- a/src/gallium/targets/libgl-gdi/SConscript +++ b/src/gallium/targets/libgl-gdi/SConscript @@ -3,6 +3,8 @@ Import('*') +import SCons.Script.SConscript + env = env.Clone() env.Append(CPPPATH = [ @@ -30,6 +32,10 @@ if env['llvm']: env.Append(CPPDEFINES = 'HAVE_LLVMPIPE') drivers += [llvmpipe] + if 'swr' in SCons.Script.ARGUMENTS and SCons.Script.ARGUMENTS['swr']: + env.Append(CPPDEFINES = 'HAVE_SWR') + drivers += [swr] + if env['gcc'] and env['machine'] != 'x86_64': # DEF parser in certain versions of MinGW is busted, as does not behave as # MSVC. mingw-w64 works fine. diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 0a4f31b..c66a751 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -3,6 +3,8 @@ Import('*') +import SCons.Script.SConscript + env = env.Clone() env.Append(CPPPATH = [ @@ -48,6 +50,10 @@ if env['llvm']: env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE']) env.Prepend(LIBS = [llvmpipe]) + if 'swr' in SCons.Script.ARGUMENTS and not SCons.Script.ARGUMENTS['swr']: + env.Append(CPPDEFINES = 'HAVE_SWR') + env.Prepend(LIBS = [swr]) + if env['platform'] != 'darwin': # Disallow undefined symbols, except with Address Sanitizer, since libasan # is not linked on shared libs, as it should be LD_PRELOAD'ed instead diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript index 7a2a00c..f390d1e 100644 --- a/src/gallium/targets/osmesa/SConscript +++ b/src/gallium/targets/osmesa/SConscript @@ -1,5 +1,7 @@ Import('*') +import SCons.Script.SConscript + env = env.Clone() env.Prepend(CPPPATH = [ @@ -30,6 +32,10 @@ if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') env.Prepend(LIBS = [llvmpipe]) + if 'swr' in SCons.Script.ARGUMENTS and not SCons.Script.ARGUMENTS['swr']: + env.Append(CPPDEFINES = 'HAVE_SWR') + env.Prepend(LIBS = [swr]) + if env['platform'] == 'windows': if env['gcc'] and env['machine'] != 'x86_64': sources += ['osmesa.mingw.def'] -- 2.10.0.windows.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev