diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-07-14 02:04:30 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-07-22 16:35:27 +0100 |
| commit | e7e29189e27bb404bf84d757a8f1dd617126808a (patch) | |
| tree | f710649b614a409f4d628ddfd27c9b0b832c9085 | |
| parent | e3420396124c75ec9679c4d1cf3a42c185207e5a (diff) | |
scons: rework the EGL build
The scons equivalent of the previous commit - just fold the almost
identical driver + main Sconscripts.
Cc: Alexander von Gluck IV <kallisti5@unixzen.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | src/SConscript | 3 | ||||
| -rw-r--r-- | src/egl/Makefile.am | 5 | ||||
| -rw-r--r-- | src/egl/SConscript (renamed from src/egl/main/SConscript) | 17 | ||||
| -rw-r--r-- | src/egl/drivers/haiku/SConscript | 25 |
4 files changed, 12 insertions, 38 deletions
diff --git a/src/SConscript b/src/SConscript index 46482fbd62..106b87d425 100644 --- a/src/SConscript +++ b/src/SConscript @@ -32,8 +32,7 @@ if not env['embedded']: if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'): SConscript('glx/SConscript') if env['platform'] == 'haiku': - SConscript('egl/drivers/haiku/SConscript') - SConscript('egl/main/SConscript') + SConscript('egl/SConscript') if env['gles']: SConscript('mapi/shared-glapi/SConscript') diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 6f9abcefc3..10eb1d56bd 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -111,10 +111,9 @@ egl_HEADERS = \ $(top_srcdir)/include/EGL/eglplatform.h EXTRA_DIST = \ + SConscript \ drivers/haiku \ docs \ main/egl.def \ main/README.txt \ - main/SConscript \ - main/Makefile.sources \ - drivers/dri2/SConscript + main/Makefile.sources diff --git a/src/egl/main/SConscript b/src/egl/SConscript index 631ba20826..a7f62824e1 100644 --- a/src/egl/main/SConscript +++ b/src/egl/SConscript @@ -6,21 +6,22 @@ Import('*') env = env.Clone() -env.Append(CPPDEFINES = [ - '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU', - '_EGL_BUILT_IN_DRIVER_HAIKU', -]) -env.Prepend(LIBS = [ - egl_haiku, -]) - env.Append(CPPPATH = [ '#/include', + '#/src/egl/main', ]) # parse Makefile.sources egl_sources = env.ParseSourceList('Makefile.sources', 'LIBEGL_C_FILES') +egl_sources.append(env.ParseSourceList('Makefile.sources', 'dri2_backend_core_FILES')) + +env.Append(CPPDEFINES = [ + '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU', + '_EGL_BUILT_IN_DRIVER_HAIKU', + 'HAVE_HAIKU_PLATFORM', +]) +egl_sources.append('drivers/haiku/egl_haiku.cpp') egl = env.SharedLibrary( target = 'EGL', diff --git a/src/egl/drivers/haiku/SConscript b/src/egl/drivers/haiku/SConscript deleted file mode 100644 index 9db7ecfdd0..0000000000 --- a/src/egl/drivers/haiku/SConscript +++ /dev/null @@ -1,25 +0,0 @@ -Import('*') - -env = env.Clone() - -env.Append(CPPPATH = [ - '#/include', - '#/src/egl/main', -]) - -sources = [ - 'egl_haiku.cpp' -] - -if env['platform'] == 'haiku': - env.Append(CPPDEFINES = [ - 'HAVE_HAIKU_PLATFORM', - '_EGL_NATIVE_PLATFORM=haiku', - ]) - -egl_haiku = env.ConvenienceLibrary( - target = 'egl_haiku', - source = sources, -) - -Export('egl_haiku') |