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/egl/main/SConscript  | 92 ++++++++++++++++++++++++------------------------
 src/egl/main/eglconfig.h |  1 +
 2 files changed, 47 insertions(+), 46 deletions(-)

(limited to 'src/egl')

diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript
index 8ade85b357..f001b81600 100644
--- a/src/egl/main/SConscript
+++ b/src/egl/main/SConscript
@@ -4,49 +4,49 @@
 
 Import('*')
 
-if env['platform'] != 'winddk':
-
-	env = env.Clone()
-
-	env.Append(CPPDEFINES = [
-		'_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_WINDOWS',
-		'_EGL_DRIVER_SEARCH_DIR=\\"\\"',
-		'_EGL_OS_WINDOWS',
-		'_EGL_GET_CORE_ADDRESSES',
-		'KHRONOS_DLL_EXPORTS',
-	])
-
-	env.Append(CPPPATH = [
-		'#/include',
-	])
-
-	egl_sources = [
-		'eglapi.c',
-		'eglarray.c',
-		'eglconfig.c',
-		'eglcontext.c',
-		'eglcurrent.c',
-		'egldisplay.c',
-		'egldriver.c',
-		'eglfallbacks.c',
-		'eglglobals.c',
-		'eglimage.c',
-		'egllog.c',
-		'eglmisc.c',
-		'eglmode.c',
-		'eglscreen.c',
-		'eglstring.c',
-		'eglsurface.c',
-		'eglsync.c',
-	]
-
-	egl = env.SharedLibrary(
-		target = 'libEGL',
-		source = egl_sources + ['egl.def'],
-	)
-
-	env.InstallSharedLibrary(egl, version=(1, 4, 0))
-
-	egl = [env.FindIxes(egl, 'LIBPREFIX', 'LIBSUFFIX')]
-
-	Export('egl')
+env = env.Clone()
+
+env.Append(CPPDEFINES = [
+    '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_WINDOWS',
+    '_EGL_DRIVER_SEARCH_DIR=\\"\\"',
+    '_EGL_OS_WINDOWS',
+    '_EGL_GET_CORE_ADDRESSES',
+    'KHRONOS_DLL_EXPORTS',
+])
+
+env.Append(CPPPATH = [
+    '#/include',
+])
+
+egl_sources = [
+    'eglapi.c',
+    'eglarray.c',
+    'eglconfig.c',
+    'eglcontext.c',
+    'eglcurrent.c',
+    'egldisplay.c',
+    'egldriver.c',
+    'eglfallbacks.c',
+    'eglglobals.c',
+    'eglimage.c',
+    'egllog.c',
+    'eglmisc.c',
+    'eglmode.c',
+    'eglscreen.c',
+    'eglstring.c',
+    'eglsurface.c',
+    'eglsync.c',
+]
+
+egl = env.SharedLibrary(
+    target = 'libEGL',
+    source = egl_sources + ['egl.def'],
+)
+
+installed_egl = env.InstallSharedLibrary(egl, version=(1, 4, 0))
+
+env.Alias('egl', installed_egl)
+
+egl = [env.FindIxes(egl, 'LIBPREFIX', 'LIBSUFFIX')]
+
+Export('egl')
diff --git a/src/egl/main/eglconfig.h b/src/egl/main/eglconfig.h
index 3457670bfa..2169960fd1 100644
--- a/src/egl/main/eglconfig.h
+++ b/src/egl/main/eglconfig.h
@@ -3,6 +3,7 @@
 
 
 #include <assert.h>
+#include <stddef.h>
 #include "egltypedefs.h"
 
 
-- 
cgit v1.2.3