[Mesa-dev] [PATCH 2/2] egl/scons: Fix every platform getting dri and haiku added e7e29189

Alexander von Gluck IV kallisti5 at unixzen.com
Fri Aug 7 11:19:55 PDT 2015


---
 src/egl/SConscript | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/egl/SConscript b/src/egl/SConscript
index 1b2a427..00761e8 100644
--- a/src/egl/SConscript
+++ b/src/egl/SConscript
@@ -15,14 +15,17 @@ env.Append(CPPPATH = [
 
 # 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')
+if env['dri']:
+    egl_sources.append(env.ParseSourceList('Makefile.sources', 'dri2_backend_core_FILES'))
+
+if env['platform'] == 'haiku':
+    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',
-- 
2.4.3



More information about the mesa-dev mailing list