summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/dri/SConscript
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-08-12 23:18:23 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-12 23:36:06 +0100
commit16873a6e62e2dc7de1f247e8cae1b40bd813a117 (patch)
tree1217bc441aa91928853f83fb445151857a2ed5c3 /src/gallium/state_trackers/dri/SConscript
parent2af28040d639dddbb7c258981a00eaf3dfcbcf03 (diff)
downloadexternal_mesa3d-16873a6e62e2dc7de1f247e8cae1b40bd813a117.zip
external_mesa3d-16873a6e62e2dc7de1f247e8cae1b40bd813a117.tar.gz
external_mesa3d-16873a6e62e2dc7de1f247e8cae1b40bd813a117.tar.bz2
st/dri: define GALLIUM_SOFTPIPE when building kms_swrast
To avoid unresolved symbols in the DRI modules with earlier commit we wrapped the innards of dri_kms_init_screen() in a DRI_TARGET/GALLIUM_SOFTPIPE ifdef. At the same time we forgot to adds the defines to the st/dri build systems, breaking kms_swrast and gnome-continuous. Drop the DRI_TARGET define, we're already in st/DRI. Reported-by: Jasper St. Pierre <jstpierre@mecheye.net> Reported-by: Vadim Rutkovsky <vrutkovs@redhat.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/gallium/state_trackers/dri/SConscript')
-rw-r--r--src/gallium/state_trackers/dri/SConscript5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/dri/SConscript b/src/gallium/state_trackers/dri/SConscript
index 159ca80..9b0dc64 100644
--- a/src/gallium/state_trackers/dri/SConscript
+++ b/src/gallium/state_trackers/dri/SConscript
@@ -19,7 +19,10 @@ env.Append(CPPPATH = [
xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
])
-env.Append(CPPDEFINES = [('GALLIUM_STATIC_TARGETS', '1')])
+env.Append(CPPDEFINES = [
+ ('GALLIUM_STATIC_TARGETS', '1'),
+ 'GALLIUM_SOFTPIPE',
+])
sources = env.ParseSourceList('Makefile.sources', 'common_SOURCES')