mesa: consolidate some compiler -D flags

-D__STDC_CONSTANT_MACROS and -D__STDC_LIMIT_MACROS are only needed for
LLVM build.

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 6aa434032dc46368a9069d784bcf2ae1f3bdb222..9b06be933d43a6ca5dd4d30087c9e03af21c0af6 100644 (file)
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -12,10 +12,11 @@ GALLIUM_DRIVERS_DIRS += llvmpipe
 OPT_FLAGS = -O3 -ansi -pedantic
 ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign
 
-DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86
+DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86 \
+       -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 
 # override -std=c99
-CFLAGS += -std=gnu99 -D__STDC_CONSTANT_MACROS
+CFLAGS += -std=gnu99
 
 LLVM_VERSION := $(shell llvm-config --version)
 

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 574385a5c9cf3579cd86e2bba9c3b2d9b1e729ba..ff355c47832677270a388ee6552bae101a13dbec 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -203,9 +203,6 @@ CPP_SOURCES += \
 endif
 
 
-LIBRARY_DEFINES += -D__STDC_CONSTANT_MACROS
-
-
 include ../Makefile.template
 
 

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 669e42e3003cfabb6bf07d29f24330a619acac56..4068bed393c92fc0a54cc0a5aea86641c5a82f82 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -3,8 +3,6 @@ include $(TOP)/configs/current
 
 LIBNAME = llvmpipe
 
-DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
-
 C_SOURCES = \
        lp_bld_alpha.c \
        lp_bld_blend_aos.c \