X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2FMakefile.am;h=d649fa44b9579561477aca33ab88f3ba95eaf530;hb=ae2cb7280436ab3fe24afef510d30201e54b795c;hp=0bd4282632ad00a05c26b55e5266da26d18bb146;hpb=48d251cebbcd5246f65c8d0913bd7a5e56cc30c6;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am
index 0bd4282632a..d649fa44b95 100644
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -25,10 +25,12 @@ include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
 	$(GALLIUM_DRIVER_CFLAGS) \
-	$(LLVM_CFLAGS)
+	$(LLVM_CFLAGS) \
+	$(MSVC2013_COMPAT_CFLAGS)
 AM_CXXFLAGS= \
 	$(GALLIUM_DRIVER_CXXFLAGS) \
-	$(LLVM_CXXFLAGS)
+	$(LLVM_CXXFLAGS) \
+	$(MSVC2013_COMPAT_CXXFLAGS)
 
 noinst_LTLIBRARIES = libllvmpipe.la
 
@@ -52,7 +54,8 @@ TEST_LIBS = \
 	$(top_builddir)/src/util/libmesautil.la \
 	$(LLVM_LIBS) \
 	$(DLOPEN_LIBS) \
-	$(PTHREAD_LIBS)
+	$(PTHREAD_LIBS) \
+	$(CLOCK_LIB)
 
 lp_test_format_SOURCES = lp_test_format.c lp_test_main.c
 lp_test_format_LDADD = $(TEST_LIBS)
@@ -74,4 +77,4 @@ lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c
 lp_test_printf_LDADD = $(TEST_LIBS)
 nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp
 
-EXTRA_DIST = SConscript
+EXTRA_DIST = SConscript meson.build