summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/dri-i915
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2010-06-28 22:33:39 +0200
committerJakob Bornecrantz <[email protected]>2010-06-28 22:33:39 +0200
commit7e1ce791c7ac6bf01c3136393bc3300a8a0c6145 (patch)
tree0fc76b8b5811f4dec27695291b53e525e3459b8c /src/gallium/targets/dri-i915
parent77cd1a989bbb76b59544c8e25b46f411b4a57989 (diff)
i915g: Add Galahad to targets
Diffstat (limited to 'src/gallium/targets/dri-i915')
-rw-r--r--src/gallium/targets/dri-i915/Makefile3
-rw-r--r--src/gallium/targets/dri-i915/SConscript3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
index 26726b24a05..068f2234dbe 100644
--- 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 5659bc80275..6f9336b5ac1 100644
--- 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,