diff options
| author | Brian Paul <brianp@vmware.com> | 2010-12-03 10:59:52 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-12-03 13:52:59 -0700 |
| commit | b87369e863c4c9650ef3a04a111e9ca79bca9e08 (patch) | |
| tree | 9b6f212901486799ba56743659c0a49b99c29731 | |
| parent | 9f7f093090c45278162a03f10e147fac688eee6f (diff) | |
mesa: consolidate some compiler -D flags
-D__STDC_CONSTANT_MACROS and -D__STDC_LIMIT_MACROS are only needed for
LLVM build.
| -rw-r--r-- | configs/linux-llvm | 5 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Makefile | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/Makefile | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/configs/linux-llvm b/configs/linux-llvm index 6aa434032d..9b06be933d 100644 --- 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 574385a5c9..ff355c4783 100644 --- 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 669e42e300..4068bed393 100644 --- 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 \ |