diff options
| author | Eric Anholt <[email protected]> | 2005-05-28 20:17:06 +0000 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2005-05-28 20:17:06 +0000 |
| commit | f054fa85d8e9f5eadf4fe845764905e102802e88 (patch) | |
| tree | 373a5391a1cefa0b23f9f677f11966b9ac1b0b7c | |
| parent | 2ed4c296d93c2df905684fad374a516c828022b7 (diff) | |
Add a freebsd-dri-amd64 config, and quiet makedepend slightly by making an
EXPAT_INCLUDES config variable (set on FreeBSD) which is then used in
Makefile.template's INCLUDES.
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | configs/freebsd-dri | 6 | ||||
| -rw-r--r-- | configs/freebsd-dri-amd64 | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 2 |
4 files changed, 14 insertions, 3 deletions
@@ -61,6 +61,7 @@ darwin \ darwin-static \ freebsd \ freebsd-dri \ +freebsd-dri-amd64 \ freebsd-dri-x86 \ hpux10 \ hpux10-gcc \ diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 8d92f11bc57..b3a99493bf8 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -11,16 +11,18 @@ CXX = g++ WARN_FLAGS = -Wall OPT_FLAGS = -O +EXPAT_INCLUDES = -I/usr/local/include X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions DEFINES = -DDRI_NEW_INTERFACE_ONLY -CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES) +CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \ + -ffast-math $(X11_INCLUDES) CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC ASM_SOURCES = # Library/program dependencies DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread +GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 diff --git a/configs/freebsd-dri-amd64 b/configs/freebsd-dri-amd64 new file mode 100644 index 00000000000..f5783772120 --- /dev/null +++ b/configs/freebsd-dri-amd64 @@ -0,0 +1,8 @@ +# -*-makefile-*- +# Configuration for freebsd-dri-amd64: FreeBSD DRI hardware drivers + +include $(TOP)/configs/freebsd-dri + +CONFIG_NAME = freebsd-dri-x86-64 + +ASM_FLAGS = -DUSE_X86_64_ASM diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index 027572c692e..7d01b22e781 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -16,7 +16,7 @@ COMMON_SOURCES = \ ifeq ($(WINDOW_SYSTEM),dri) WINOBJ=../dri_client/dri.a WINLIB= -INCLUDES = $(SHARED_INCLUDES) \ +INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) \ -I../dri_client \ -I../dri_client/imports |