diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-06 16:48:36 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-06 16:48:36 +0000 |
| commit | f4d5b1da7bd9084eda4745b1d4cb1916ce05e257 (patch) | |
| tree | 24823e2fc7472c4ac38fe32f2a534fb41e110b6d /src/mesa | |
| parent | 0dcab2a86a6e842571eb194591deb397bb98c023 (diff) | |
Set DRIVER_DEFINES instead of DEFINES to fix duplicate flags problem
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r200/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/Makefile | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile index 7d8a170a65..2084d52132 100644 --- a/src/mesa/drivers/dri/r200/Makefile +++ b/src/mesa/drivers/dri/r200/Makefile @@ -38,7 +38,7 @@ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES) X86_SOURCES = r200_vtxtmp_x86.S -DEFINES += -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200 +DRIVER_DEFINES = -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200 SYMLINKS = \ server/radeon_egl.c \ diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile index 3158ac8412..5abb91d987 100644 --- a/src/mesa/drivers/dri/r300/Makefile +++ b/src/mesa/drivers/dri/r300/Makefile @@ -5,7 +5,6 @@ TOP = ../../../../.. include $(TOP)/configs/current LIBNAME = r300_dri.so -DEFINES += -DCOMPILE_R300 -DGLX_DIRECT_RENDERING -DR200_MERGED=0 MINIGLX_SOURCES = server/radeon_dri.c @@ -70,7 +69,8 @@ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES) X86_SOURCES = #r200_vtxtmp_x86.S -DEFINES += -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 +DRIVER_DEFINES = -DCOMPILE_R300 -DGLX_DIRECT_RENDERING -DR200_MERGED=0 \ + -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 SYMLINKS = \ server/radeon_dri.c \ diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile index 34dc58e2dc..6e46620b39 100644 --- a/src/mesa/drivers/dri/radeon/Makefile +++ b/src/mesa/drivers/dri/radeon/Makefile @@ -32,7 +32,7 @@ C_SOURCES = \ $(COMMON_SOURCES) \ $(DRIVER_SOURCES) -DEFINES += -DRADEON_COMMON=0 +DRIVER_DEFINES = -DRADEON_COMMON=0 X86_SOURCES = \ radeon_vtxtmp_x86.S |