From 0fda1cb498b1308f09679b1947fd038f680dffb8 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 6 Oct 2013 15:41:54 +0000 Subject: haiku: Fix llvmpipe and clean up softpipe tracing * Fix LLVM library and defines * Only enable tracing when scons build=debug Acked-by: Brian Paul --- src/gallium/targets/haiku-softpipe/SConscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gallium/targets/haiku-softpipe/SConscript') diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript index 3a16c3174c4..40bf03cf413 100644 --- a/src/gallium/targets/haiku-softpipe/SConscript +++ b/src/gallium/targets/haiku-softpipe/SConscript @@ -26,7 +26,8 @@ env.Append(CPPPATH = [ ]) if env['llvm']: - env.Append(CPPDEFINES = 'HAVE_LLVMPIPE') + env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE']) + env.Prepend(LIBS = [llvmpipe]) softpipe_sources = [ 'GalliumContext.cpp', @@ -34,7 +35,7 @@ softpipe_sources = [ 'SoftwareRenderer.cpp' ] -# libswpipe gets turned into "Software Renderer" by the haiku package system +# libswpipe gets turned into "Softpipe" by the haiku package system module = env.LoadableModule( target ='swpipe', source = softpipe_sources, -- cgit v1.2.3