From 601498ae73e654c2de997ea75075613a694d604d Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 1 Nov 2010 13:30:22 +0000
Subject: scons: Revamp how to specify targets to build.

Use scons target and dependency system instead of ad-hoc options.

Now is simply a matter of naming what to build. For example:

  scons libgl-xlib

  scons libgl-gdi

  scons graw-progs

  scons llvmpipe

and so on. And there is also the possibility of scepcified subdirs, e.g.

  scons src/gallium/drivers

If nothing is specified then everything will be build.

There might be some rough corners over the next days. Please bare with me.
---
 src/gallium/targets/libgl-gdi/SConscript | 85 ++++++++++++++++----------------
 1 file changed, 43 insertions(+), 42 deletions(-)

(limited to 'src/gallium/targets/libgl-gdi')

diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 12fe403f62..339238756a 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -3,45 +3,46 @@
 
 Import('*')
 
-if env['platform'] == 'windows':
-
-    env = env.Clone()
-
-    env.Append(CPPPATH = [
-        '#src/gallium/state_trackers/wgl',
-        '#src/gallium/winsys/sw',
-    ])
-
-    env.Append(LIBS = [
-        'gdi32',
-        'user32',
-        'kernel32',
-        'ws2_32',
-        talloc,
-    ])
-
-    sources = []
-    drivers = []
-
-    if True:
-        sources = ['gdi_softpipe_winsys.c']
-        drivers = [softpipe]
-
-    if env['llvm']:
-        sources = ['gdi_llvmpipe_winsys.c']
-        drivers = [llvmpipe]
-
-    if env['gcc']:
-        sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
-    else:
-        sources += ['#src/gallium/state_trackers/wgl/opengl32.def']
-        
-    drivers += [trace, rbug]
-
-    env['no_import_lib'] = 1
-
-    env.SharedLibrary(
-        target ='opengl32',
-        source = sources,
-        LIBS = wgl + ws_gdi + glapi + mesa + drivers + gallium + glsl + env['LIBS'],
-    )
+env = env.Clone()
+
+env.Append(CPPPATH = [
+    '#src/gallium/state_trackers/wgl',
+    '#src/gallium/winsys/sw',
+])
+
+env.Append(LIBS = [
+    'gdi32',
+    'user32',
+    'kernel32',
+    'ws2_32',
+    talloc,
+])
+
+sources = []
+drivers = []
+
+if True:
+    sources = ['gdi_softpipe_winsys.c']
+    drivers = [softpipe]
+
+if env['llvm']:
+    sources = ['gdi_llvmpipe_winsys.c']
+    drivers = [llvmpipe]
+
+if env['gcc']:
+    sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
+else:
+    sources += ['#src/gallium/state_trackers/wgl/opengl32.def']
+    
+drivers += [trace, rbug]
+
+env['no_import_lib'] = 1
+
+opengl32 = env.SharedLibrary(
+    target ='opengl32',
+    source = sources,
+    LIBS = wgl + ws_gdi + glapi + mesa + drivers + gallium + glsl + env['LIBS'],
+)
+
+env.Alias('opengl32', opengl32)
+env.Alias('libgl-gdi', opengl32)
-- 
cgit v1.2.3