i915g: Add Galahad to targets

diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
index 26726b24a0528c037f51f89fc157f87394e7190d..068f2234dbe2fb28e45d800f08148e5c37bb1453 100644 (file)
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -6,6 +6,7 @@ LIBNAME = i915_dri.so
 PIPE_DRIVERS = \
        $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
        $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \
+       $(TOP)/src/gallium/drivers/galahad/libgalahad.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/rbug/librbug.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
@@ -18,7 +19,7 @@ C_SOURCES = \
        $(DRIVER_SOURCES)
 
 DRIVER_DEFINES = \
-       -DGALLIUM_RBUG -DGALLIUM_TRACE
+       -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD
 
 include ../Makefile.dri
 

diff --git a/src/gallium/targets/dri-i915/SConscript b/src/gallium/targets/dri-i915/SConscript
index 5659bc8027528050ef631c7e6e24f13a495c0716..6f9336b5ac14ff3e4ee78a4b8b6ece23e14d05d9 100644 (file)
--- a/src/gallium/targets/dri-i915/SConscript
+++ b/src/gallium/targets/dri-i915/SConscript
@@ -8,12 +8,13 @@ env = drienv.Clone()
 
 env.ParseConfig('pkg-config --cflags --libs libdrm_intel')
 
-env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
+env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD'])
 
 env.Prepend(LIBS = [
     st_dri,
     i915drm,
     i915,
+    galahad,
     trace,
     rbug,
     mesa,

diff --git a/src/gallium/targets/egl-i915/Makefile b/src/gallium/targets/egl-i915/Makefile
index c3ffe78029d88f7a7481368040a97cef9b5a283c..43c67a49c36c5561c35329ef3b0213a48119db01 100644 (file)
--- a/src/gallium/targets/egl-i915/Makefile
+++ b/src/gallium/targets/egl-i915/Makefile
@@ -6,10 +6,11 @@ EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS = -ldrm_intel
 
 EGL_DRIVER_DEFINES = \
-       -DGALLIUM_RBUG -DGALLIUM_TRACE
+       -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD
 
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \
+       $(TOP)/src/gallium/drivers/galahad/libgalahad.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/rbug/librbug.a \
        $(TOP)/src/gallium/drivers/i915/libi915.a

diff --git a/src/gallium/targets/xorg-i915/Makefile b/src/gallium/targets/xorg-i915/Makefile
index 3ab7285fb935aa0db88c04ba4d0d41d1fe6bd69a..45b0622ca9ad51f6076ae2895160fe66beb3ca1b 100644 (file)
--- a/src/gallium/targets/xorg-i915/Makefile
+++ b/src/gallium/targets/xorg-i915/Makefile
@@ -8,12 +8,13 @@ C_SOURCES = \
        intel_xorg.c
 
 DRIVER_DEFINES = \
-       -DHAVE_CONFIG_H -DGALLIUM_RBUG -DGALLIUM_TRACE
+       -DHAVE_CONFIG_H -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD
 
 DRIVER_LINKS = \
        $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
        $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \
        $(TOP)/src/gallium/drivers/i915/libi915.a \
+       $(TOP)/src/gallium/drivers/galahad/libgalahad.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/rbug/librbug.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \