summaryrefslogtreecommitdiffstats
path: root/src/egl
diff options
context:
space:
mode:
Diffstat (limited to 'src/egl')
-rw-r--r--src/egl/Makefile.am5
-rw-r--r--src/egl/SConscript (renamed from src/egl/main/SConscript)17
-rw-r--r--src/egl/drivers/haiku/SConscript25
3 files changed, 11 insertions, 36 deletions
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 6f9abcefc38..10eb1d56bdd 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 631ba20826a..a7f62824e14 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 9db7ecfdd07..00000000000
--- 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')