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.

diff --git a/Makefile b/Makefile
index 80295daafb4750e1f50c2c7b4c9bcfcff0a3eafc..4413bb6dc735e23810d5acfc8681ec40dcb89c99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 8d92f11bc575e731e61b316a7454bb431842be21..b3a99493bf87ea809f2adfb16c821f6ef4f7ceb8 100644 (file)
--- 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 (file)
index 0000000..f578377
--- /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 027572c692e4f4caf9137dcdd8e6ce6799747872..7d01b22e7810951926f2e48dc24e8b93c56bd235 100644 (file)
--- 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