scons: Detabify
Drivers scons files for a later time
This commit is contained in:
@@ -50,14 +50,14 @@ SConscript('winsys/sw/null/SConscript')
|
|||||||
|
|
||||||
SConscript('state_trackers/python/SConscript')
|
SConscript('state_trackers/python/SConscript')
|
||||||
if env['platform'] != 'embedded':
|
if env['platform'] != 'embedded':
|
||||||
SConscript('state_trackers/glx/xlib/SConscript')
|
SConscript('state_trackers/glx/xlib/SConscript')
|
||||||
SConscript('state_trackers/dri/SConscript')
|
SConscript('state_trackers/dri/SConscript')
|
||||||
SConscript('state_trackers/xorg/SConscript')
|
SConscript('state_trackers/xorg/SConscript')
|
||||||
SConscript('state_trackers/egl/SConscript')
|
SConscript('state_trackers/egl/SConscript')
|
||||||
SConscript('state_trackers/vega/SConscript')
|
SConscript('state_trackers/vega/SConscript')
|
||||||
|
|
||||||
if env['platform'] == 'windows':
|
if env['platform'] == 'windows':
|
||||||
SConscript('state_trackers/wgl/SConscript')
|
SConscript('state_trackers/wgl/SConscript')
|
||||||
|
|
||||||
#
|
#
|
||||||
# Winsys
|
# Winsys
|
||||||
@@ -89,13 +89,13 @@ if env['platform'] == 'windows':
|
|||||||
if env['dri']:
|
if env['dri']:
|
||||||
SConscript([
|
SConscript([
|
||||||
'targets/SConscript.dri',
|
'targets/SConscript.dri',
|
||||||
'targets/dri-i915/SConscript',
|
'targets/dri-i915/SConscript',
|
||||||
'targets/dri-i965/SConscript',
|
'targets/dri-i965/SConscript',
|
||||||
#'targets/dri-nouveau/SConscript',
|
#'targets/dri-nouveau/SConscript',
|
||||||
'targets/dri-r300/SConscript',
|
'targets/dri-r300/SConscript',
|
||||||
'targets/dri-r600/SConscript',
|
'targets/dri-r600/SConscript',
|
||||||
'targets/dri-swrast/SConscript',
|
'targets/dri-swrast/SConscript',
|
||||||
'targets/dri-vmwgfx/SConscript',
|
'targets/dri-vmwgfx/SConscript',
|
||||||
])
|
])
|
||||||
|
|
||||||
if env['xorg']:
|
if env['xorg']:
|
||||||
@@ -113,6 +113,5 @@ if env['xorg']:
|
|||||||
#
|
#
|
||||||
|
|
||||||
if env['platform'] != 'embedded':
|
if env['platform'] != 'embedded':
|
||||||
SConscript('tests/unit/SConscript')
|
SConscript('tests/unit/SConscript')
|
||||||
SConscript('tests/graw/SConscript')
|
SConscript('tests/graw/SConscript')
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
Import('*')
|
Import('*')
|
||||||
|
|
||||||
SConscript([
|
SConscript([
|
||||||
'sw/SConscript',
|
'sw/SConscript',
|
||||||
'drm/SConscript',
|
'drm/SConscript',
|
||||||
])
|
])
|
||||||
|
@@ -12,16 +12,16 @@ if env['dri']:
|
|||||||
env.Append(CPPPATH = [
|
env.Append(CPPPATH = [
|
||||||
'#/src/mapi',
|
'#/src/mapi',
|
||||||
'#/src/mesa',
|
'#/src/mesa',
|
||||||
'#/src/gallium/state_trackers/dri/common',
|
'#/src/gallium/state_trackers/dri/common',
|
||||||
'#/src/mesa/drivers/dri/common',
|
'#/src/mesa/drivers/dri/common',
|
||||||
])
|
])
|
||||||
|
|
||||||
st_dri = env.ConvenienceLibrary(
|
st_dri = env.ConvenienceLibrary(
|
||||||
target = 'st_dri',
|
target = 'st_dri',
|
||||||
source = [ 'dri_context.c',
|
source = [ 'dri_context.c',
|
||||||
'dri_drawable.c',
|
'dri_drawable.c',
|
||||||
'dri_screen.c',
|
'dri_screen.c',
|
||||||
'dri2.c',
|
'dri2.c',
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
Export('st_dri')
|
Export('st_dri')
|
||||||
|
@@ -10,18 +10,18 @@ if env['dri']:
|
|||||||
env.Append(CPPPATH = [
|
env.Append(CPPPATH = [
|
||||||
'#/src/mapi',
|
'#/src/mapi',
|
||||||
'#/src/mesa',
|
'#/src/mesa',
|
||||||
'#/src/gallium/state_trackers/dri/common',
|
'#/src/gallium/state_trackers/dri/common',
|
||||||
'#/src/mesa/drivers/dri/common',
|
'#/src/mesa/drivers/dri/common',
|
||||||
])
|
])
|
||||||
|
|
||||||
env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')])
|
env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')])
|
||||||
|
|
||||||
st_drisw = env.ConvenienceLibrary(
|
st_drisw = env.ConvenienceLibrary(
|
||||||
target = 'st_drisw',
|
target = 'st_drisw',
|
||||||
source = [ 'dri_context.c',
|
source = [ 'dri_context.c',
|
||||||
'dri_drawable.c',
|
'dri_drawable.c',
|
||||||
'dri_screen.c',
|
'dri_screen.c',
|
||||||
'drisw.c',
|
'drisw.c',
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
Export('st_drisw')
|
Export('st_drisw')
|
||||||
|
@@ -10,33 +10,33 @@ env.Append(CPPPATH = [
|
|||||||
])
|
])
|
||||||
|
|
||||||
vega_sources = [
|
vega_sources = [
|
||||||
'api.c',
|
'api.c',
|
||||||
'api_context.c',
|
'api_context.c',
|
||||||
'api_filters.c',
|
'api_filters.c',
|
||||||
'api_images.c',
|
'api_images.c',
|
||||||
'api_masks.c',
|
'api_masks.c',
|
||||||
'api_misc.c',
|
'api_misc.c',
|
||||||
'api_paint.c',
|
'api_paint.c',
|
||||||
'api_params.c',
|
'api_params.c',
|
||||||
'api_path.c',
|
'api_path.c',
|
||||||
'api_text.c',
|
'api_text.c',
|
||||||
'api_transform.c',
|
'api_transform.c',
|
||||||
'vgu.c',
|
'vgu.c',
|
||||||
'vg_context.c',
|
'vg_context.c',
|
||||||
'vg_manager.c',
|
'vg_manager.c',
|
||||||
'vg_state.c',
|
'vg_state.c',
|
||||||
'vg_translate.c',
|
'vg_translate.c',
|
||||||
'polygon.c',
|
'polygon.c',
|
||||||
'bezier.c',
|
'bezier.c',
|
||||||
'path.c',
|
'path.c',
|
||||||
'paint.c',
|
'paint.c',
|
||||||
'arc.c',
|
'arc.c',
|
||||||
'image.c',
|
'image.c',
|
||||||
'renderer.c',
|
'renderer.c',
|
||||||
'stroker.c',
|
'stroker.c',
|
||||||
'mask.c',
|
'mask.c',
|
||||||
'shader.c',
|
'shader.c',
|
||||||
'shaders_cache.c',
|
'shaders_cache.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
# vgapi_header must be generated first
|
# vgapi_header must be generated first
|
||||||
|
@@ -7,9 +7,9 @@ if env['platform'] in ['windows']:
|
|||||||
env = env.Clone()
|
env = env.Clone()
|
||||||
|
|
||||||
env.Append(CPPPATH = [
|
env.Append(CPPPATH = [
|
||||||
'#src/mapi',
|
'#src/mapi',
|
||||||
'#src/mesa',
|
'#src/mesa',
|
||||||
'.',
|
'.',
|
||||||
])
|
])
|
||||||
|
|
||||||
env.AppendUnique(CPPDEFINES = [
|
env.AppendUnique(CPPDEFINES = [
|
||||||
|
@@ -9,65 +9,65 @@ if not env['dri']:
|
|||||||
drienv = env.Clone()
|
drienv = env.Clone()
|
||||||
|
|
||||||
drienv.Replace(CPPPATH = [
|
drienv.Replace(CPPPATH = [
|
||||||
'#src/mesa/drivers/dri/common',
|
'#src/mesa/drivers/dri/common',
|
||||||
'#include',
|
'#include',
|
||||||
'#include/GL/internal',
|
'#include/GL/internal',
|
||||||
'#src/mapi',
|
'#src/mapi',
|
||||||
'#src/gallium/include',
|
'#src/gallium/include',
|
||||||
'#src/gallium/auxiliary',
|
'#src/gallium/auxiliary',
|
||||||
'#src/gallium/drivers',
|
'#src/gallium/drivers',
|
||||||
'#src/gallium/winsys',
|
'#src/gallium/winsys',
|
||||||
'#src/mesa',
|
'#src/mesa',
|
||||||
'#src/mesa/main',
|
'#src/mesa/main',
|
||||||
'#src/mesa/glapi',
|
'#src/mesa/glapi',
|
||||||
'#src/mesa/math',
|
'#src/mesa/math',
|
||||||
'#src/mesa/transform',
|
'#src/mesa/transform',
|
||||||
'#src/mesa/shader',
|
'#src/mesa/shader',
|
||||||
'#src/mesa/swrast',
|
'#src/mesa/swrast',
|
||||||
'#src/mesa/swrast_setup',
|
'#src/mesa/swrast_setup',
|
||||||
'#src/egl/main',
|
'#src/egl/main',
|
||||||
'#src/egl/drivers/dri',
|
'#src/egl/drivers/dri',
|
||||||
])
|
])
|
||||||
|
|
||||||
drienv.ParseConfig('pkg-config --cflags --libs libdrm')
|
drienv.ParseConfig('pkg-config --cflags --libs libdrm')
|
||||||
|
|
||||||
dri_common_utils = drienv.SharedObject(
|
dri_common_utils = drienv.SharedObject(
|
||||||
target = 'utils.o',
|
target = 'utils.o',
|
||||||
source = '#src/mesa/drivers/dri/common/utils.c'
|
source = '#src/mesa/drivers/dri/common/utils.c'
|
||||||
)
|
)
|
||||||
|
|
||||||
dri_common_xmlconfig = drienv.SharedObject(
|
dri_common_xmlconfig = drienv.SharedObject(
|
||||||
target = 'xmlconfig.o',
|
target = 'xmlconfig.o',
|
||||||
source = '#src/mesa/drivers/dri/common/xmlconfig.c'
|
source = '#src/mesa/drivers/dri/common/xmlconfig.c'
|
||||||
)
|
)
|
||||||
|
|
||||||
dri_common_vblank = drienv.SharedObject(
|
dri_common_vblank = drienv.SharedObject(
|
||||||
target = 'vblank.o',
|
target = 'vblank.o',
|
||||||
source = '#src/mesa/drivers/dri/common/vblank.c'
|
source = '#src/mesa/drivers/dri/common/vblank.c'
|
||||||
)
|
)
|
||||||
|
|
||||||
dri_common_dri_util = drienv.SharedObject(
|
dri_common_dri_util = drienv.SharedObject(
|
||||||
target = 'dri_util.o',
|
target = 'dri_util.o',
|
||||||
source = '#src/mesa/drivers/dri/common/dri_util.c'
|
source = '#src/mesa/drivers/dri/common/dri_util.c'
|
||||||
)
|
)
|
||||||
|
|
||||||
dri_common_drisw_util = drienv.SharedObject(
|
dri_common_drisw_util = drienv.SharedObject(
|
||||||
target = 'drisw_util.o',
|
target = 'drisw_util.o',
|
||||||
source = '#src/mesa/drivers/dri/common/drisw_util.c'
|
source = '#src/mesa/drivers/dri/common/drisw_util.c'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
COMMON_DRI_SW_OBJECTS = [
|
COMMON_DRI_SW_OBJECTS = [
|
||||||
dri_common_utils,
|
dri_common_utils,
|
||||||
dri_common_xmlconfig,
|
dri_common_xmlconfig,
|
||||||
dri_common_drisw_util,
|
dri_common_drisw_util,
|
||||||
]
|
]
|
||||||
|
|
||||||
COMMON_DRI_DRM_OBJECTS = [
|
COMMON_DRI_DRM_OBJECTS = [
|
||||||
dri_common_utils,
|
dri_common_utils,
|
||||||
dri_common_xmlconfig,
|
dri_common_xmlconfig,
|
||||||
dri_common_vblank,
|
dri_common_vblank,
|
||||||
dri_common_dri_util,
|
dri_common_dri_util,
|
||||||
]
|
]
|
||||||
|
|
||||||
drienv.AppendUnique(LIBS = [
|
drienv.AppendUnique(LIBS = [
|
||||||
@@ -76,7 +76,7 @@ drienv.AppendUnique(LIBS = [
|
|||||||
])
|
])
|
||||||
|
|
||||||
Export([
|
Export([
|
||||||
'drienv',
|
'drienv',
|
||||||
'COMMON_DRI_SW_OBJECTS',
|
'COMMON_DRI_SW_OBJECTS',
|
||||||
'COMMON_DRI_DRM_OBJECTS',
|
'COMMON_DRI_DRM_OBJECTS',
|
||||||
])
|
])
|
||||||
|
@@ -40,7 +40,7 @@ env.Prepend(LIBS = [
|
|||||||
st_xorg,
|
st_xorg,
|
||||||
svgadrm,
|
svgadrm,
|
||||||
svga,
|
svga,
|
||||||
gallium,
|
gallium,
|
||||||
])
|
])
|
||||||
|
|
||||||
sources = [
|
sources = [
|
||||||
|
@@ -5,37 +5,37 @@ env = env.Clone()
|
|||||||
env.ParseConfig('pkg-config --cflags libdrm')
|
env.ParseConfig('pkg-config --cflags libdrm')
|
||||||
|
|
||||||
if env['gcc']:
|
if env['gcc']:
|
||||||
env.Append(CCFLAGS = ['-fvisibility=hidden'])
|
env.Append(CCFLAGS = ['-fvisibility=hidden'])
|
||||||
env.Append(CPPDEFINES = [
|
env.Append(CPPDEFINES = [
|
||||||
'HAVE_STDINT_H',
|
'HAVE_STDINT_H',
|
||||||
'HAVE_SYS_TYPES_H',
|
'HAVE_SYS_TYPES_H',
|
||||||
'-D_FILE_OFFSET_BITS=64',
|
'-D_FILE_OFFSET_BITS=64',
|
||||||
])
|
])
|
||||||
|
|
||||||
env.Prepend(CPPPATH = [
|
env.Prepend(CPPPATH = [
|
||||||
'include',
|
'include',
|
||||||
'#/src/gallium/drivers/svga',
|
'#/src/gallium/drivers/svga',
|
||||||
'#/src/gallium/drivers/svga/include',
|
'#/src/gallium/drivers/svga/include',
|
||||||
])
|
])
|
||||||
|
|
||||||
env.Append(CPPDEFINES = [
|
env.Append(CPPDEFINES = [
|
||||||
])
|
])
|
||||||
|
|
||||||
sources = [
|
sources = [
|
||||||
'vmw_buffer.c',
|
'vmw_buffer.c',
|
||||||
'vmw_context.c',
|
'vmw_context.c',
|
||||||
'vmw_fence.c',
|
'vmw_fence.c',
|
||||||
'vmw_screen.c',
|
'vmw_screen.c',
|
||||||
'vmw_screen_dri.c',
|
'vmw_screen_dri.c',
|
||||||
'vmw_screen_ioctl.c',
|
'vmw_screen_ioctl.c',
|
||||||
'vmw_screen_pools.c',
|
'vmw_screen_pools.c',
|
||||||
'vmw_screen_svga.c',
|
'vmw_screen_svga.c',
|
||||||
'vmw_surface.c',
|
'vmw_surface.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
svgadrm = env.ConvenienceLibrary(
|
svgadrm = env.ConvenienceLibrary(
|
||||||
target = 'svgadrm',
|
target = 'svgadrm',
|
||||||
source = sources,
|
source = sources,
|
||||||
)
|
)
|
||||||
|
|
||||||
Export('svgadrm')
|
Export('svgadrm')
|
||||||
|
Reference in New Issue
Block a user