summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-08-11 20:29:45 +0000
committerIan Romanick <idr@us.ibm.com>2005-08-11 20:29:45 +0000
commitf2876d1ee3b878a07b12ddcb464633a44f7c29e7 (patch)
tree9e46feeaeb58aa5484ff2a11f6632bea84bcca29 /configs
parentfbcc5aedf2a06e14030a3e67d2be9fd043e3cf38 (diff)
downloadexternal_mesa3d-f2876d1ee3b878a07b12ddcb464633a44f7c29e7.zip
external_mesa3d-f2876d1ee3b878a07b12ddcb464633a44f7c29e7.tar.gz
external_mesa3d-f2876d1ee3b878a07b12ddcb464633a44f7c29e7.tar.bz2
Remove the logic that determines at compile time whether or not HAVE_ALIAS
should be defined. It was flawed on some platforms (e.g., Darwin & mingw). Instead, rely on the build system to define it on the compiler command line. This also reverts ajax's hand-edit to indirect_size.c. I'll fix that on the X.org side of things later today.
Diffstat (limited to 'configs')
-rw-r--r--configs/freebsd-dri2
-rw-r--r--configs/linux-dri2
-rw-r--r--configs/linux-indirect5
3 files changed, 5 insertions, 4 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 031fabb..b68d3cb 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -14,7 +14,7 @@ OPT_FLAGS = -O
EXPAT_INCLUDES = -I/usr/local/include
X11_INCLUDES = -I/usr/X11R6/include
DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
- -DGLX_DIRECT_RENDERING
+ -DGLX_DIRECT_RENDERING -DHAVE_ALIAS
CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \
-ffast-math $(X11_INCLUDES)
CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
diff --git a/configs/linux-dri b/configs/linux-dri
index 7ff5d23..3235fcf 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -23,7 +23,7 @@ ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE \
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
- -DGLX_DIRECT_RENDERING
+ -DGLX_DIRECT_RENDERING -DHAVE_ALIAS
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(ASM_FLAGS) -std=c99 -ffast-math
diff --git a/configs/linux-indirect b/configs/linux-indirect
index 2102228..a5c6995 100644
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -1,5 +1,6 @@
# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
+# Configuration for linux-indirect: Builds a libGL capable of indirect
+# rendering, but *NOT* capable of direct rendering.
include $(TOP)/configs/default
@@ -22,7 +23,7 @@ ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE \
- -DPTHREADS
+ -DPTHREADS -DHAVE_ALIAS
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(ASM_FLAGS) -std=c99 -ffast-math