Mesa (master): scons: Move dependancy checks to the main gallium scons file
Jakob Bornecrantz
wallbraker at kemper.freedesktop.org
Fri Nov 5 20:59:19 UTC 2010
Module: Mesa
Branch: master
Commit: 7e9f5eab4e18e0b661fc9b65a0f409d10e041b24
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e9f5eab4e18e0b661fc9b65a0f409d10e041b24
Author: Jakob Bornecrantz <jakob at vmware.com>
Date: Fri Nov 5 18:18:09 2010 +0000
scons: Move dependancy checks to the main gallium scons file
---
src/gallium/SConscript | 18 ++++--
src/gallium/state_trackers/dri/drm/SConscript | 23 ++++----
src/gallium/state_trackers/dri/sw/SConscript | 23 ++++----
src/gallium/state_trackers/egl/SConscript | 3 -
src/gallium/state_trackers/glx/xlib/SConscript | 3 -
src/gallium/state_trackers/wgl/SConscript | 71 +++++++++++------------
src/gallium/state_trackers/xorg/SConscript | 3 -
7 files changed, 69 insertions(+), 75 deletions(-)
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 9436b68..207987b 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -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
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index 7e3a264..90082ff 100644
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -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')
diff --git a/src/gallium/state_trackers/dri/sw/SConscript b/src/gallium/state_trackers/dri/sw/SConscript
index 03c2ef6..8646d27 100644
--- a/src/gallium/state_trackers/dri/sw/SConscript
+++ b/src/gallium/state_trackers/dri/sw/SConscript
@@ -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')
diff --git a/src/gallium/state_trackers/egl/SConscript b/src/gallium/state_trackers/egl/SConscript
index 8d34e47..50c7681 100644
--- a/src/gallium/state_trackers/egl/SConscript
+++ b/src/gallium/state_trackers/egl/SConscript
@@ -3,9 +3,6 @@
Import('*')
-if env['platform'] != 'windows':
- Return()
-
env = env.Clone()
env.Append(CPPPATH = [
diff --git a/src/gallium/state_trackers/glx/xlib/SConscript b/src/gallium/state_trackers/glx/xlib/SConscript
index 775000e..0542a5f 100644
--- a/src/gallium/state_trackers/glx/xlib/SConscript
+++ b/src/gallium/state_trackers/glx/xlib/SConscript
@@ -3,9 +3,6 @@
Import('*')
-if not env['x11']:
- Return()
-
env = env.Clone()
env.Append(CPPPATH = [
diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index 994b0c8..ec55f04 100644
--- a/src/gallium/state_trackers/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
@@ -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')
diff --git a/src/gallium/state_trackers/xorg/SConscript b/src/gallium/state_trackers/xorg/SConscript
index bc7821f..1022954 100644
--- a/src/gallium/state_trackers/xorg/SConscript
+++ b/src/gallium/state_trackers/xorg/SConscript
@@ -3,9 +3,6 @@
Import('*')
-if not env['x11'] or not env['dri'] or not env['xorg']:
- Return()
-
env = env.Clone()
env.Append(CPPPATH = [
More information about the mesa-commit
mailing list