fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-22 07:30:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

scons: Move dependancy checks to the main gallium scons file

Browse source
This commit is contained in:
Jakob Bornecrantz 2010-11-05 18:18:09 +00:00
parent c0db7854d5
commit 7e9f5eab4e
7 changed files with 69 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gallium/SConscript
View file

@ -54,14 +54,22 @@ SConscript('winsys/sw/null/SConscript')
SConscript('state_trackers/python/SConscript')
if env['platform'] != 'embedded':
SConscript('state_trackers/glx/xlib/SConscript')
SConscript('state_trackers/dri/SConscript')
SConscript('state_trackers/xorg/SConscript')
SConscript('state_trackers/egl/SConscript')
SConscript('state_trackers/vega/SConscript')
if env['x11']:
SConscript('state_trackers/glx/xlib/SConscript')
if env['dri']:
SConscript('state_trackers/dri/SConscript')
if env['dri'] and env['xorg']:
SConscript('state_trackers/xorg/SConscript')
if env['platform'] == 'windows':
SConscript('state_trackers/wgl/SConscript')
SConscript([
'state_trackers/egl/SConscript',
'state_trackers/wgl/SConscript',
])
#
# Winsys

23
src/gallium/state_trackers/dri/drm/SConscript
View file

@ -3,20 +3,18 @@
Import('*')
if env['dri']:
env = env.Clone()
env = env.Clone()
env.ParseConfig('pkg-config --cflags --libs libdrm')
env.ParseConfig('pkg-config --cflags --libs libdrm')
env.Append(CPPPATH = [
'#/src/mapi',
'#/src/mesa',
'#/src/gallium/state_trackers/dri/common',
'#/src/mesa/drivers/dri/common',
])
env.Append(CPPPATH = [
'#/src/mapi',
'#/src/mesa',
'#/src/gallium/state_trackers/dri/common',
'#/src/mesa/drivers/dri/common',
])
st_dri = env.ConvenienceLibrary(
st_dri = env.ConvenienceLibrary(
target = 'st_dri',
source = [ 'dri_context.c',
'dri_drawable.c',
@ -24,4 +22,5 @@ if env['dri']:
'dri2.c',
]
)
Export('st_dri')
Export('st_dri')

23
src/gallium/state_trackers/dri/sw/SConscript
View file

@ -3,20 +3,18 @@
Import('*')
if env['dri']:
env = env.Clone()
env = env.Clone()
env.Append(CPPPATH = [
'#/src/mapi',
'#/src/mesa',
'#/src/gallium/state_trackers/dri/common',
'#/src/mesa/drivers/dri/common',
])
env.Append(CPPPATH = [
'#/src/mapi',
'#/src/mesa',
'#/src/gallium/state_trackers/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',
source = [ 'dri_context.c',
'dri_drawable.c',
@ -24,4 +22,5 @@ if env['dri']:
'drisw.c',
]
)
Export('st_drisw')
Export('st_drisw')

3
src/gallium/state_trackers/egl/SConscript
View file

@ -3,9 +3,6 @@
Import('*')
if env['platform'] != 'windows':
Return()
env = env.Clone()
env.Append(CPPPATH = [

3
src/gallium/state_trackers/glx/xlib/SConscript
View file

@ -3,9 +3,6 @@
Import('*')
if not env['x11']:
Return()
env = env.Clone()
env.Append(CPPPATH = [

71
src/gallium/state_trackers/wgl/SConscript
View file

@ -2,41 +2,38 @@ import os
Import('*')
if env['platform'] in ['windows']:
env = env.Clone()
env.Append(CPPPATH = [
'#src/mapi',
'#src/mesa',
'.',
])
env.AppendUnique(CPPDEFINES = [
'_GDI32_', # prevent wgl* being declared __declspec(dllimport)
'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
'WIN32_THREADS', # use Win32 thread API
'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
])
sources = [
'stw_context.c',
'stw_device.c',
'stw_ext_extensionsstring.c',
'stw_ext_gallium.c',
'stw_ext_pixelformat.c',
'stw_ext_swapinterval.c',
'stw_framebuffer.c',
'stw_getprocaddress.c',
'stw_pixelformat.c',
'stw_st.c',
'stw_tls.c',
'stw_wgl.c',
]
env = env.Clone()
wgl = env.ConvenienceLibrary(
target ='wgl',
source = sources,
)
Export('wgl')
env.Append(CPPPATH = [
'#src/mapi',
'#src/mesa',
'.',
])
env.AppendUnique(CPPDEFINES = [
'_GDI32_', # prevent wgl* being declared __declspec(dllimport)
'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
'WIN32_THREADS', # use Win32 thread API
'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
])
sources = [
'stw_context.c',
'stw_device.c',
'stw_ext_extensionsstring.c',
'stw_ext_gallium.c',
'stw_ext_pixelformat.c',
'stw_ext_swapinterval.c',
'stw_framebuffer.c',
'stw_getprocaddress.c',
'stw_pixelformat.c',
'stw_st.c',
'stw_tls.c',
'stw_wgl.c',
]
wgl = env.ConvenienceLibrary(
target ='wgl',
source = sources,
)
Export('wgl')

3
src/gallium/state_trackers/xorg/SConscript
View file

@ -3,9 +3,6 @@
Import('*')
if not env['x11'] or not env['dri'] or not env['xorg']:
Return()
env = env.Clone()
env.Append(CPPPATH = [