panfrost: Avoid accessing pan_pool fields directly

[mesa.git] / src / gallium / targets / haiku-softpipe / SConscript

diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript
index 0a99976aef5b866de9e92b82c5bf50457c42011f..312155abe14fd1417430ce72de76db7dc5de4c4e 100644 (file)
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -2,43 +2,46 @@ Import('*')
 
 env.Prepend(LIBS = [
     ws_haiku,
-    trace,
-    rbug,
+    st_haiku,
+    mesautil,
+    compiler,
     mesa,
     glsl,
+    nir,
+    spirv,
     gallium
 ])
 
 if True:
     env.Append(CPPDEFINES = [
         'GALLIUM_SOFTPIPE',
-        'GALLIUM_RBUG',
-        'GALLIUM_TRACE',
     ])
     env.Prepend(LIBS = [softpipe])
 
+env.Prepend(LIBS = [libgl])
+
 env.Append(CPPPATH = [
     '#/src/mapi',
     '#/src/mesa',
     '#/src/mesa/main',
-    '#/src/gallium/winsys/sw/hgl',
+    '#/include/HaikuGL',
+    '#/src/gallium/winsys',
+    '#/src/gallium/frontends/hgl',
     '/boot/system/develop/headers/private',
 ])
 
 if env['llvm']:
-    env.Append(CPPDEFINES = 'HAVE_LLVMPIPE')
+    env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
+    env.Prepend(LIBS = [llvmpipe])
 
 softpipe_sources = [
-    'haiku-softpipe.c',
     'GalliumContext.cpp',
-    'GalliumFramebuffer.cpp',
     'SoftwareRenderer.cpp'
 ]
 
-# libswpipe gets turned into "Software Renderer" by the haiku package system
-module = env.SharedLibrary(
+# libswpipe gets turned into "Softpipe" by the haiku package system
+module = env.LoadableModule(
     target ='swpipe',
     source = softpipe_sources,
 )
 
-env.Alias('softpipe-haiku', module)