scons: Don't build egl on Windows.

Useless, as there are no drivers for it.

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/SConscript b/src/SConscript
index 188ab08b6aae587227f270fb5b1d8c826daf9625..40b7fc151de72f47019649dbb6f8a733952b8829 100644 (file)
--- 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 893ad266bfe510d6c9fcd2a6fc9fd64fbe7b4c7f..b6617366c7ed92e7fe3aa0d67571e8644a3d596a 100644 (file)
--- 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 b4e9b67a2efede68ff9fc083a251e3a64afe6b4d..c0012831bb943cd3a570f0c5e7835591139d9b41 100644 (file)
--- 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',