From 0bf07d32cbd460220c67d726900772cf3692746d Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 1 Feb 2011 10:02:38 +0000 Subject: libX11 libXinerama mesa git update 1 Feb 2011 --- mesalib/src/SConscript | 52 +++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) (limited to 'mesalib/src/SConscript') diff --git a/mesalib/src/SConscript b/mesalib/src/SConscript index f86447c08..d5cde1c96 100644 --- a/mesalib/src/SConscript +++ b/mesalib/src/SConscript @@ -1,28 +1,24 @@ -Import('*') - -if env['platform'] == 'windows': - SConscript('getopt/SConscript') - SConscript('talloc/SConscript') -else: - talloc = 'talloc' - Export('talloc') - -SConscript('glsl/SConscript') -# When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not -# used. libgl-xlib and libgl-gdi adapt themselves to use the targets defined -# in mapi/glapi-shared/SConscript. mesa/SConscript also adapts itself to -# enable OpenGL ES support. -SConscript('mapi/glapi/SConscript') -SConscript('mesa/SConscript') - -SConscript('mapi/vgapi/SConscript') - -if env['platform'] != 'embedded': - SConscript('egl/main/SConscript') - SConscript('glut/glx/SConscript') - - if env['gles']: - SConscript('mapi/shared-glapi/SConscript') - -SConscript('gallium/SConscript') - +Import('*') + +if env['platform'] == 'windows': + SConscript('getopt/SConscript') + +SConscript('glsl/SConscript') +# When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not +# used. libgl-xlib and libgl-gdi adapt themselves to use the targets defined +# in mapi/glapi-shared/SConscript. mesa/SConscript also adapts itself to +# enable OpenGL ES support. +SConscript('mapi/glapi/SConscript') +SConscript('mesa/SConscript') + +SConscript('mapi/vgapi/SConscript') + +if env['platform'] != 'embedded': + SConscript('egl/main/SConscript') + SConscript('glut/glx/SConscript') + + if env['gles']: + SConscript('mapi/shared-glapi/SConscript') + +SConscript('gallium/SConscript') + -- cgit v1.2.3