summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/SConscript2
-rw-r--r--src/egl/main/Makefile.am1
-rw-r--r--src/egl/main/SConscript11
3 files changed, 2 insertions, 12 deletions
diff --git a/src/SConscript b/src/SConscript
index 188ab08b6aa..40b7fc151de 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 893ad266bfe..b6617366c7e 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 b4e9b67a2ef..c0012831bb9 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',