summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
Diffstat (limited to 'configs')
-rw-r--r--configs/default2
-rw-r--r--configs/freebsd-dri3
-rw-r--r--configs/linux-dri22
-rw-r--r--configs/linux-dri-x86-647
4 files changed, 21 insertions, 13 deletions
diff --git a/configs/default b/configs/default
index 5489e49bd0..22e3fd830b 100644
--- a/configs/default
+++ b/configs/default
@@ -23,7 +23,7 @@ GLU_CFLAGS =
# Misc tools and flags
MKLIB_OPTIONS =
MKDEP = makedepend
-MKDEP_OPTIONS = -Y -fdepend
+MKDEP_OPTIONS = -fdepend
MAKE = make
# Library names (base name)
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index a718ded572..5925f00334 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -11,7 +11,8 @@ CXX = g++
WARN_FLAGS = -Wall
OPT_FLAGS = -O
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES)
CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC
ASM_SOURCES =
diff --git a/configs/linux-dri b/configs/linux-dri
index 955da94907..912ff5fb14 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -10,18 +10,22 @@ CC = gcc
CXX = g++
WARN_FLAGS = -Wall
-OPT_FLAGS = -O
-SOURCE_FLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE
+OPT_FLAGS = -O -g
PIC_FLAGS = -fPIC
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY $(WARN_FLAGS) -g $(OPT_FLAGS) $(ASM_FLAGS) \
- -std=c99 $(PIC_FLAGS) -ffast-math $(SOURCE_FLAGS) -DPTHREADS \
- -DUSE_EXTERNAL_DXTN_LIB=1 \
- -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY $(WARN_FLAGS) -g $(OPT_FLAGS) -fPIC \
- $(SOURCE_FLAGS)
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+ -D_BSD_SOURCE -D_GNU_SOURCE \
+ -DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1
+
+X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+
+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(ASM_FLAGS) -std=c99 $(PIC_FLAGS) -ffast-math \
+ $(DEFINES)
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
+ $(DEFINES)
+
ASM_SOURCES =
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index c886d17c41..616de54efb 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -9,9 +9,12 @@ CONFIG_NAME = linux-dri-x86-64
CC = gcc
CXX = g++
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -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
+DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE -D__AMD64__
-CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -m64 -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
+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)