swr: add linux to scons build

Make swr compile for both linux and windows.

Reviewed-by: Tim Rowley <timothy.o.rowley@intel.com>
This commit is contained in:
George Kyriazis 2017-04-13 08:44:08 -05:00
parent e20eb91e2b
commit 870760e02e
2 changed files with 2 additions and 7 deletions

View file

@ -17,11 +17,6 @@ if env['LLVM_VERSION'] < distutils.version.LooseVersion('3.9'):
env['swr'] = False
Return()
if env['platform'] != 'windows':
print "warning: swr scons build only supports windows: not building swr"
env['swr'] = False
Return()
env.MSVC2013Compat()
env = env.Clone()
@ -205,7 +200,7 @@ envavx2.Append(CPPDEFINES = ['KNOB_ARCH=KNOB_ARCH_AVX2'])
if env['platform'] == 'windows':
envavx2.Append(CCFLAGS = ['/arch:AVX2'])
else:
envavx2.Append(CCFLAGS = ['-mavx2'])
envavx2.Append(CCFLAGS = ['-mavx2', '-mfma', '-mbmi2', '-mf16c'])
swrAVX2 = envavx2.SharedLibrary(
target = 'swrAVX2',

View file

@ -49,7 +49,7 @@ if env['llvm']:
env.Prepend(LIBS = [llvmpipe])
if env['swr']:
env.Append(CPPDEFINES = 'HAVE_SWR')
env.Append(CPPDEFINES = 'GALLIUM_SWR')
env.Prepend(LIBS = [swr])
if env['platform'] != 'darwin':