Commit e8d884ea authored by José Fonseca's avatar José Fonseca
Browse files

scons: Fixup the libgl-gdi build.

parent 6b707667
...@@ -53,8 +53,6 @@ opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers, ...@@ -53,8 +53,6 @@ opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe'])) ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe']))
opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys, opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon'])) ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon']))
opts.Add(ListVariable('targets', 'target drivers to build', 'all',
['xlib']))
opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
......
...@@ -5,12 +5,12 @@ Import('*') ...@@ -5,12 +5,12 @@ Import('*')
# 'drm/SConscript', # 'drm/SConscript',
# ]) # ])
if 'xlib' in env['targets']: if 'xlib' in env['winsys']:
SConscript([ SConscript([
'libgl-xlib/SConscript', 'libgl-xlib/SConscript',
]) ])
#if 'gdi' in env['winsys']: if 'gdi' in env['winsys']:
# SConscript([ SConscript([
# 'gdi/SConscript', 'libgl-gdi/SConscript',
# ]) ])
...@@ -37,9 +37,10 @@ ...@@ -37,9 +37,10 @@
#include <windows.h> #include <windows.h>
#include "stw_winsys.h" #include "stw_winsys.h"
#include "gdi_sw_winsys.h" #include "gdi/gdi_sw_winsys.h"
#include "llvmpipe/lp_texture.h" #include "llvmpipe/lp_texture.h"
#include "llvmpipe/lp_screen.h" #include "llvmpipe/lp_screen.h"
#include "llvmpipe/lp_public.h"
static struct pipe_screen * static struct pipe_screen *
......
...@@ -37,9 +37,10 @@ ...@@ -37,9 +37,10 @@
#include <windows.h> #include <windows.h>
#include "stw_winsys.h" #include "stw_winsys.h"
#include "gdi_sw_winsys.h" #include "gdi/gdi_sw_winsys.h"
#include "softpipe/sp_texture.h" #include "softpipe/sp_texture.h"
#include "softpipe/sp_screen.h" #include "softpipe/sp_screen.h"
#include "softpipe/sp_public.h"
static struct pipe_screen * static struct pipe_screen *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment