AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i915g: Add Galahad to targets

Browse Source
This commit is contained in:
Jakob Bornecrantz
2010-06-28 22:33:39 +02:00
parent 77cd1a989b
commit 7e1ce791c7
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/targets/dri-i915/Makefile
+2 -1
View File
@@ -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
src/gallium/targets/dri-i915/SConscript
+2 -1
View File
@@ -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,
src/gallium/targets/egl-i915/Makefile
+2 -1
View File
@@ -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
src/gallium/targets/xorg-i915/Makefile
+2 -1
View File
@@ -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 \