llvmpipe: asst fixes for 'make linux-llvmpipe'

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 6e63a0c2b76ba0585daf6c7f547477c0b1c4ac53..5ac09de79ea3a44a501868ce558d18bf2b5435ce 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -3,6 +3,8 @@ include $(TOP)/configs/current
 
 LIBNAME = llvmpipe
 
+CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
+
 C_SOURCES = \
        lp_bld_alpha.c \
        lp_bld_arit.c \

diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 522f6dc5aee0991cba36a4de45bfb91a70008f01..3a1945d92c589b7645a1dd12149ff7ae4450aed7 100644 (file)
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -34,6 +34,7 @@ XLIB_WINSYS_SOURCES = \
        xlib_brw_aub.c \
        xlib_brw_context.c \
        xlib_brw_screen.c \
+       xlib_llvmpipe.c \
        xlib_softpipe.c \
        xlib_trace.c 
 

diff --git a/src/gallium/winsys/xlib/xlib_llvmpipe.c b/src/gallium/winsys/xlib/xlib_llvmpipe.c
index bc876591c0db24e23c278a5c70035f07241b9692..3dd15e099b043278e5722640a900a11e73beb0b0 100644 (file)
--- a/src/gallium/winsys/xlib/xlib_llvmpipe.c
+++ b/src/gallium/winsys/xlib/xlib_llvmpipe.c
@@ -33,6 +33,8 @@
  */
 
 
+#if defined(GALLIUM_LLVMPIPE)
+
 #include "xm_api.h"
 
 #undef ASSERT
@@ -459,3 +461,4 @@ struct xm_driver xlib_llvmpipe_driver =
 
 
 
+#endif /* GALLIUM_LLVMPIPE */