summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2015-03-24 20:26:21 +0000
committerJose Fonseca <jfonseca@vmware.com>2015-03-25 10:42:35 +0000
commit47870d658b777722d48d6b9084d66e270a04e52e (patch)
tree47cc9ab736b848e36d0d2b7ac22cfc8c05461f81
parentf9b8c9299d10542c9806927018a488f84adcb036 (diff)
downloadexternal_mesa3d-47870d658b777722d48d6b9084d66e270a04e52e.zip
external_mesa3d-47870d658b777722d48d6b9084d66e270a04e52e.tar.gz
external_mesa3d-47870d658b777722d48d6b9084d66e270a04e52e.tar.bz2
scons: Don't build loader on Windows.
EGL was the last user. Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/SConscript3
-rw-r--r--src/loader/Makefile.am1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/SConscript b/src/SConscript
index 40b7fc1..b0578e8 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 3d32279..36ddba8 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)