summaryrefslogtreecommitdiffstats
path: root/configs/linux-dri-x86-64
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-04-06 21:34:34 +0000
committerIan Romanick <idr@us.ibm.com>2005-04-06 21:34:34 +0000
commitbfc8a8dc6324f5e984566208bd0a1fa472102917 (patch)
tree0b5bdede0fe5a243cb8a356d6684527bd6d6adc0 /configs/linux-dri-x86-64
parent29c909f81ceae4a0356718d6be0a14562c98c019 (diff)
downloadexternal_mesa3d-bfc8a8dc6324f5e984566208bd0a1fa472102917.zip
external_mesa3d-bfc8a8dc6324f5e984566208bd0a1fa472102917.tar.gz
external_mesa3d-bfc8a8dc6324f5e984566208bd0a1fa472102917.tar.bz2
Make linux-dri-x86-64 more like linux-dri-x86. Add ARCH_FLAGS. This is
where things like "-m64" or "-m32" should be specified. Using this, a 32-bit DRI build can be done on an x86-64 system by doing 'ARCH_CFLAGS=-m32 make linux-dri-x86'. Minor tweaks to linux-dri to support these changes.
Diffstat (limited to 'configs/linux-dri-x86-64')
-rw-r--r--configs/linux-dri-x86-6434
1 files changed, 7 insertions, 27 deletions
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index bc11524..7793bf4 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -1,40 +1,20 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-dri
CONFIG_NAME = linux-dri-x86-64
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE
-
-CFLAGS = -m64 -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math $(DEFINES)
-CXXFLAGS = -m64 -Wall -g -ansi -pedantic -fPIC $(DEFINES)
-
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-
-#ASM_SOURCES = $(X86_SOURCES)
+ARCH_FLAGS = -m64
LIB_DIR = $(TOP)/lib64
# Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11
-
-# Directories
-SRC_DIRS = mesa glu glut/glx glw glx/x11
-DRIVER_DIRS = dri
-PROGRAM_DIRS =
-WINDOW_SYSTEM=dri
+EXTRA_LIB_PATH=-L/usr/X11R6/lib64
-# ffb, gamma, and sis are missing because they have
-# not be converted to use the new interface. Do i810 & i830 really
-# need to be included here?
+# ffb, gamma, and sis are missing because they have not be converted to use
+# the new interface. i810 and i830 are missing because there is no x86-64
+# system where they could *ever* be used.
#
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome savage
+DRI_DIRS = dri_client i915 mach64 mga r128 r200 radeon tdfx unichrome savage