Mesa (master): scons: Don't build loader on Windows.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Mar 25 10:44:19 UTC 2015
Module: Mesa
Branch: master
Commit: 47870d658b777722d48d6b9084d66e270a04e52e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=47870d658b777722d48d6b9084d66e270a04e52e
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Tue Mar 24 20:26:21 2015 +0000
scons: Don't build loader on Windows.
EGL was the last user.
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/SConscript | 3 ++-
src/loader/Makefile.am | 1 -
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)
More information about the mesa-commit
mailing list