Mesa (master): scons: Don't build egl on Windows.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Mar 25 10:44:19 UTC 2015
Module: Mesa
Branch: master
Commit: f9b8c9299d10542c9806927018a488f84adcb036
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9b8c9299d10542c9806927018a488f84adcb036
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Tue Mar 24 20:11:36 2015 +0000
scons: Don't build egl on Windows.
Useless, as there are no drivers for it.
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/SConscript | 2 +-
src/egl/main/Makefile.am | 1 -
src/egl/main/SConscript | 11 +----------
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/SConscript b/src/SConscript
index 188ab08..40b7fc1 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -30,7 +30,7 @@ SConscript('mesa/SConscript')
if not env['embedded']:
if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
SConscript('glx/SConscript')
- if env['platform'] not in ['darwin', 'haiku', 'sunos']:
+ if env['platform'] not in ['darwin', 'haiku', 'sunos', 'windows']:
if env['dri']:
SConscript('egl/drivers/dri2/SConscript')
SConscript('egl/main/SConscript')
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 893ad26..b661736 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -26,7 +26,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/gbm/main \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
- $(MSVC2013_COMPAT_CFLAGS) \
$(EGL_CFLAGS) \
-D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
-D_EGL_DRIVER_SEARCH_DIR=\"$(libdir)/egl\" \
diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript
index b4e9b67..c001283 100644
--- a/src/egl/main/SConscript
+++ b/src/egl/main/SConscript
@@ -6,20 +6,11 @@ Import('*')
env = env.Clone()
-env.MSVC2013Compat()
-
env.Append(CPPDEFINES = [
'_EGL_DRIVER_SEARCH_DIR=\\"\\"',
])
-if env['platform'] == 'windows':
- env.Append(CPPDEFINES = [
- '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_WINDOWS',
- '_EGL_OS_WINDOWS',
- '_EGL_GET_CORE_ADDRESSES',
- 'KHRONOS_DLL_EXPORTS',
- ])
-elif env['platform'] == 'haiku':
+if env['platform'] == 'haiku':
env.Append(CPPDEFINES = [
'_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU',
'_EGL_OS_UNIX',
More information about the mesa-commit
mailing list