summaryrefslogtreecommitdiff
path: root/configs/linux-osmesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-04-28 07:21:25 -0600
committerBrian Paul <brianp@vmware.com>2010-04-28 07:21:25 -0600
commit1fa7789e828d1005e2473fc7cd364bd45eb30843 (patch)
tree5e3e1978e6cc511e90298622b7a04840a285782d /configs/linux-osmesa
parent37e98e5cd217075d58456753ed8450dc116fe32c (diff)
parenteecd2a59c1205246cc220ab09a79988838bb1759 (diff)
Merge branch '7.8'
Conflicts: src/glx/dri2_glx.c src/glx/glx_pbuffer.c
Diffstat (limited to 'configs/linux-osmesa')
-rw-r--r--configs/linux-osmesa6
1 files changed, 3 insertions, 3 deletions
diff --git a/configs/linux-osmesa b/configs/linux-osmesa
index c112642f89..3015f5fcbb 100644
--- a/configs/linux-osmesa
+++ b/configs/linux-osmesa
@@ -9,7 +9,7 @@ CONFIG_NAME = linux-osmesa
# Compiler and flags
CC = gcc
CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
+CFLAGS = -g -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
# Work around aliasing bugs - developers should comment this out
@@ -17,12 +17,12 @@ CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
# Directories
-SRC_DIRS = gallium mesa glu
+SRC_DIRS = glsl mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS = osdemos
# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
+OSMESA_LIB_DEPS = -lm -lpthread -ldl
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
APP_LIB_DEPS = -lm -lpthread