mesa: Move declaration to top of block.

[mesa.git] / src / gallium / targets / graw-xlib / SConscript

diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript
index e50eb8a03d75ed7937e275f23708c1e65fb413e0..76e4d4fd64ee409f62720f28d890d562b4bc814a 100644 (file)
--- a/src/gallium/targets/graw-xlib/SConscript
+++ b/src/gallium/targets/graw-xlib/SConscript
@@ -7,27 +7,28 @@ env = env.Clone()
 
 env.Prepend(LIBS = [
     ws_xlib,
-    trace,
-    rbug,
-    identity,
     gallium,
 ])
 
-env.Prepend(LIBS = env['X11_LIBS'])
+env.Append(LIBS = env['X11_LIBS'])
+env.Append(LIBPATH = env['X11_LIBPATH'])
 
 env.Append(CPPPATH = [
     '#src/gallium/drivers',
     '#src/gallium/include/state_tracker',
+    '#src/gallium/winsys',
 ])
 
+env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD'])
+
 sources = [
     'graw_xlib.c',
     graw_util
 ]
 
 if True:
-    env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
-    env.Prepend(LIBS = [softpipe])
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
+    env.Prepend(LIBS = [trace, rbug, galahad, softpipe])
 
 if env['llvm']:
     env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')