Commit aeee5269 authored by Jakob Bornecrantz's avatar Jakob Bornecrantz Committed by Jerome Glisse

r600g: Integrate into build

Signed-off-by: default avatarJakob Bornecrantz <wallbraker@gmail.com>
parent 9abfc5ef
...@@ -51,9 +51,9 @@ common.AddOptions(opts) ...@@ -51,9 +51,9 @@ common.AddOptions(opts)
opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers, opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
['mesa', 'python', 'xorg'])) ['mesa', 'python', 'xorg']))
opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers, opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe', 'nouveau', 'nv50', 'nvfx'])) ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'r600', 'identity', 'llvmpipe', 'nouveau', 'nv50', 'nvfx']))
opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys, opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'graw-xlib'])) ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon', 'r600', 'graw-xlib']))
opts.Add(ListVariable('targets', 'driver targets to build', default_targets, opts.Add(ListVariable('targets', 'driver targets to build', default_targets,
['dri-i915', ['dri-i915',
......
...@@ -1509,6 +1509,19 @@ elif test "x$enable_gallium_radeon" = xauto; then ...@@ -1509,6 +1509,19 @@ elif test "x$enable_gallium_radeon" = xauto; then
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
fi fi
dnl
dnl Gallium Radeon r600g configuration
dnl
AC_ARG_ENABLE([gallium-r600],
[AS_HELP_STRING([--enable-gallium-r600],
[build gallium radeon @<:@default=disabled@:>@])],
[enable_gallium_r600="$enableval"],
[enable_gallium_r600=auto])
if test "x$enable_gallium_r600" = xyes; then
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
gallium_check_st "r600/drm" "dri-r600"
fi
dnl dnl
dnl Gallium Nouveau configuration dnl Gallium Nouveau configuration
dnl dnl
......
Import('*') Import('*')
env = env.Clone() env = env.Clone()
env.ParseConfig('pkg-config --cflags libdrm_radeon')
env.Append(CPPPATH = [ env.Append(CPPPATH = [
'#/include', '#/include',
'#/src/mesa', '#/src/mesa',
......
...@@ -99,3 +99,8 @@ if 'radeon' in env['winsys']: ...@@ -99,3 +99,8 @@ if 'radeon' in env['winsys']:
SConscript([ SConscript([
'dri-radeong/SConscript', 'dri-radeong/SConscript',
]) ])
if 'r600' in env['winsys']:
SConscript([
'dri-r600/SConscript',
])
...@@ -10,7 +10,7 @@ env.ParseConfig('pkg-config --cflags --libs libdrm_radeon') ...@@ -10,7 +10,7 @@ env.ParseConfig('pkg-config --cflags --libs libdrm_radeon')
env.Prepend(LIBS = [ env.Prepend(LIBS = [
st_dri, st_dri,
r600winsys, r600drm,
r600, r600,
trace, trace,
mesa, mesa,
......
...@@ -40,3 +40,8 @@ if env['dri']: ...@@ -40,3 +40,8 @@ if env['dri']:
SConscript([ SConscript([
'radeon/drm/SConscript', 'radeon/drm/SConscript',
]) ])
if 'r600' in env['winsys']:
SConscript([
'r600/drm/SConscript',
])
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