summaryrefslogtreecommitdiff
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-03-10 11:34:09 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-03-10 11:34:09 +0000
commite8d884eab9b96f2db647363f17649ff35570c710 (patch)
treeee47204fe04a4e199dbdd02cc9b6763182efbad6 /src/gallium/targets
parent6b707667c853c6c0ded3715050a01cfdbd4883c2 (diff)
scons: Fixup the libgl-gdi build.
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/SConscript10
-rw-r--r--src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c3
-rw-r--r--src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c3
3 files changed, 9 insertions, 7 deletions
diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript
index 266d705f89..df62fc65fb 100644
--- a/src/gallium/targets/SConscript
+++ b/src/gallium/targets/SConscript
@@ -5,12 +5,12 @@ Import('*')
# 'drm/SConscript',
# ])
-if 'xlib' in env['targets']:
+if 'xlib' in env['winsys']:
SConscript([
'libgl-xlib/SConscript',
])
-#if 'gdi' in env['winsys']:
-# SConscript([
-# 'gdi/SConscript',
-# ])
+if 'gdi' in env['winsys']:
+ SConscript([
+ 'libgl-gdi/SConscript',
+ ])
diff --git a/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c b/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c
index f20c2614e2..29316a1ce2 100644
--- a/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c
+++ b/src/gallium/targets/libgl-gdi/gdi_llvmpipe_winsys.c
@@ -37,9 +37,10 @@
#include <windows.h>
#include "stw_winsys.h"
-#include "gdi_sw_winsys.h"
+#include "gdi/gdi_sw_winsys.h"
#include "llvmpipe/lp_texture.h"
#include "llvmpipe/lp_screen.h"
+#include "llvmpipe/lp_public.h"
static struct pipe_screen *
diff --git a/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c b/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c
index 5c5c154c7f..dfe60195d9 100644
--- a/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c
+++ b/src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c
@@ -37,9 +37,10 @@
#include <windows.h>
#include "stw_winsys.h"
-#include "gdi_sw_winsys.h"
+#include "gdi/gdi_sw_winsys.h"
#include "softpipe/sp_texture.h"
#include "softpipe/sp_screen.h"
+#include "softpipe/sp_public.h"
static struct pipe_screen *