diff options
| -rw-r--r-- | configs/freebsd-dri | 5 | ||||
| -rw-r--r-- | configs/linux-dri | 4 | ||||
| -rw-r--r-- | configs/linux-solo | 6 | ||||
| -rw-r--r-- | configs/linux-solo-ia64 | 6 | ||||
| -rw-r--r-- | configs/linux-solo-x86 | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/Makefile | 2 |
7 files changed, 18 insertions, 13 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 5925f003340..f057774163d 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -12,8 +12,9 @@ WARN_FLAGS = -Wall OPT_FLAGS = -O X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions -CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES) -CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC +DEFINES = -DDRI_NEW_INTERFACE_ONLY +CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES) +CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC ASM_SOURCES = diff --git a/configs/linux-dri b/configs/linux-dri index 912ff5fb14b..0392bce9322 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -9,6 +9,10 @@ CONFIG_NAME = linux-dri CC = gcc CXX = g++ +MKDEP = /usr/X11R6/bin/makedepend +#MKDEP = gcc -M +#MKDEP_OPTIONS = -MF depend + WARN_FLAGS = -Wall OPT_FLAGS = -O -g PIC_FLAGS = -fPIC diff --git a/configs/linux-solo b/configs/linux-solo index 0ee8b832dc5..2f33d750a06 100644 --- a/configs/linux-solo +++ b/configs/linux-solo @@ -8,11 +8,11 @@ CONFIG_NAME = linux-solo CC = gcc CXX = g++ -CCOMMON = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE +DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -CFLAGS = $(CCOMMON) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math +CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC +CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC ASM_SOURCES = $(X86_SOURCES) diff --git a/configs/linux-solo-ia64 b/configs/linux-solo-ia64 index d8059057013..200ce11aa1d 100644 --- a/configs/linux-solo-ia64 +++ b/configs/linux-solo-ia64 @@ -8,11 +8,11 @@ CONFIG_NAME = linux-solo-ia64 CC = gcc CXX = g++ -CCOMMON = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE +DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -CFLAGS = $(CCOMMON) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math +CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC +CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC # Library/program dependencies diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86 index bb00d1c9b97..06de21cb420 100644 --- a/configs/linux-solo-x86 +++ b/configs/linux-solo-x86 @@ -8,11 +8,11 @@ CONFIG_NAME = linux-solo-x86 CC = gcc CXX = g++ -CCOMMON = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS +DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -CFLAGS = $(CCOMMON) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math +CFLAGS = $(DEFINES) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math -CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC +CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC ASM_SOURCES = $(X86_SOURCES) diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index a9c8241df0f..82beaa8aa3e 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -82,7 +82,7 @@ $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src # Run 'make depend' to update the dependencies if you change # what's included by any source file. -depend: $(C_SOURCES) $(ASM_SOURCES) +depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS) touch depend $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \ > /dev/null diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile index ddc4652ac5d..406ade22e23 100644 --- a/src/mesa/drivers/dri/r200/Makefile +++ b/src/mesa/drivers/dri/r200/Makefile @@ -6,7 +6,7 @@ include $(TOP)/configs/current LIBNAME = r200_dri.so MINIGLX_SOURCES = server/radeon_dri.c - + COMMON_SOURCES = \ ../../common/driverfuncs.c \ |