Set DRIVER_DEFINES instead of DEFINES to fix duplicate flags problem

This commit is contained in:
Brian Paul 2006-04-06 16:48:36 +00:00
parent 0dcab2a86a
commit f4d5b1da7b
3 changed files with 4 additions and 4 deletions

View file

@ -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 \

View file

@ -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 \

View file

@ -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