summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/linux-dri2
-rw-r--r--configs/linux-dri-x86-642
-rw-r--r--src/mesa/drivers/dri/Makefile.template4
3 files changed, 6 insertions, 2 deletions
diff --git a/configs/linux-dri b/configs/linux-dri
index 70c71e5812..2553961e04 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -9,7 +9,7 @@ CONFIG_NAME = linux-dri
CC = gcc
CXX = g++
-CFLAGS = -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 -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+CFLAGS = -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 -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
CXXFLAGS = -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index a829a14be7..2155712a97 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -9,7 +9,7 @@ CONFIG_NAME = linux-dri-x86-64
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
+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 -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__
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 250259785b..f39cbbed0a 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -51,6 +51,10 @@ SHARED_INCLUDES = \
-I$(TOP)/src/mesa/swrast \
-I$(TOP)/src/mesa/swrast_setup
+# Of course we're direct rendering. Redundant #ifdefs in the code
+# from prehistory require this:
+#
+DEFINES += -DGLX_DIRECT_RENDERING
##### RULES #####