summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2004-04-30 08:29:04 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2004-04-30 08:29:04 +0000
commit69ab4fec1220d831afbabc3f578634094bc63b2b (patch)
tree2105fa11bd9ccc57b5fd197e0b4122458bb4c453
parent4d46e4b26a1b93507663f3c25f8bf9d5a8466ce0 (diff)
AMD64 changes from Ronny V. Vindenes.
-rw-r--r--Makefile1
-rw-r--r--configs/linux-dri-x86-6434
-rw-r--r--configs/linux-x86-646
-rw-r--r--configs/linux-x86-64-static6
-rw-r--r--src/mesa/main/imports.h2
5 files changed, 42 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0a82aa88cf..52c0df9469 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,7 @@ linux-alpha \
linux-alpha-static \
linux-debug \
linux-dri \
+linux-dri-x86-64 \
linux-glide \
linux-icc \
linux-icc-static \
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
new file mode 100644
index 0000000000..a829a14be7
--- /dev/null
+++ b/configs/linux-dri-x86-64
@@ -0,0 +1,34 @@
+# -*-makefile-*-
+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-dri-x86-64
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+CFLAGS = -m64 -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE -DGLX_DIRECT_RENDERING -D__AMD64__ -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+
+CXXFLAGS = -m64 -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
+
+#ASM_SOURCES = $(X86_SOURCES)
+
+LIB_DIR = $(TOP)/lib64
+
+# Library/program dependencies
+GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread -lexpat -ldl
+GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lXm -lX11
+
+# Directories
+SRC_DIRS = mesa glu glut/glx glw
+DRIVER_DIRS = dri
+PROGRAM_DIRS =
+WINDOW_SYSTEM=dri
+
+# ffb & savage missing:
+#
+DRI_DIRS = dri_client gamma i810 i830 mach64 mga r128 r200 radeon sis tdfx unichrome
+
diff --git a/configs/linux-x86-64 b/configs/linux-x86-64
index 96d1d7fd19..7f27ed80b4 100644
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -8,14 +8,14 @@ CONFIG_NAME = linux-x86-64
CC = gcc
CXX = g++
-CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
+CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include
-CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
GLUT_CFLAGS = -fexceptions
-ASM_SOURCES = $(X86_SOURCES)
+#ASM_SOURCES = $(X86_SOURCES)
LIB_DIR = $(TOP)/lib64
diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
index 9fc0131f59..9110462306 100644
--- a/configs/linux-x86-64-static
+++ b/configs/linux-x86-64-static
@@ -8,9 +8,9 @@ CONFIG_NAME = linux-x86-64-static
CC = gcc
CXX = g++
-CFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
+CFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include
-CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
GLUT_CFLAGS = -fexceptions
@@ -25,7 +25,7 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
-ASM_SOURCES = $(X86_SOURCES)
+#ASM_SOURCES = $(X86_SOURCES)
LIB_DIR = $(TOP)/lib64
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index d4df749f50..40d1809d3d 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -224,7 +224,7 @@ extern void _ext_mesa_free_pixelbuffer( void *pb );
***/
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
defined(__s390x__) || defined(__powerpc__) || \
- defined(__AMD64__) || defined(__amd64__) || \
+ defined(__AMD64__) || \
defined(ia64) || defined(__ia64__) || \
(defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
#define USE_IEEE