From 47870d658b777722d48d6b9084d66e270a04e52e Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Tue, 24 Mar 2015 20:26:21 +0000 Subject: [PATCH] scons: Don't build loader on Windows. EGL was the last user. Reviewed-by: Brian Paul --- src/SConscript | 3 ++- src/loader/Makefile.am | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SConscript b/src/SConscript index 40b7fc151de..b0578e89258 100644 --- a/src/SConscript +++ b/src/SConscript @@ -12,7 +12,8 @@ if env['hostonly']: # compilation Return() -SConscript('loader/SConscript') +if env['platform'] != 'windows': + SConscript('loader/SConscript') # When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not # used. libgl-xlib and libgl-gdi adapt themselves to use the targets defined diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am index 3d32279ea26..36ddba82bd3 100644 --- a/src/loader/Makefile.am +++ b/src/loader/Makefile.am @@ -30,7 +30,6 @@ libloader_la_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ $(VISIBILITY_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) \ $(LIBUDEV_CFLAGS) libloader_la_SOURCES = $(LOADER_C_FILES) -- 2.30.2