aboutsummaryrefslogtreecommitdiff
path: root/mesalib/configs/solaris-x86-gcc
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-15 11:32:48 +0200
committermarha <marha@users.sourceforge.net>2011-07-15 11:32:48 +0200
commit3fbadc13acf6beb4a2497970367e2c2c1b6039ca (patch)
tree44bc51faf9ba2bf08022a268f1a85c55fc4431ca /mesalib/configs/solaris-x86-gcc
parent4b424e0ba999b47ca62298e8104f76f940aac4d8 (diff)
parent2ce12f084113a0097fa1a0d67e2f8fe1ab70092b (diff)
downloadvcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.gz
vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.bz2
vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libX11/configure.ac mesalib/configs/linux-dri mesalib/docs/download.html mesalib/src/SConscript mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/bufferobj.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/program/program.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/dix/window.c xorg-server/xkb/xkb.c xorg-server/xkb/xkmread.c
Diffstat (limited to 'mesalib/configs/solaris-x86-gcc')
-rw-r--r--mesalib/configs/solaris-x86-gcc2
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/configs/solaris-x86-gcc b/mesalib/configs/solaris-x86-gcc
index 616bfdfd7..065ce369f 100644
--- a/mesalib/configs/solaris-x86-gcc
+++ b/mesalib/configs/solaris-x86-gcc
@@ -9,7 +9,6 @@ CC = gcc
CXX = g++
CFLAGS = -O3 -march=i486 -fPIC -I/usr/openwin/include -DUSE_XSHM
CXXFLAGS = -O3 -march=i486 -fPIC
-GLUT_CFLAGS = -fexceptions
# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
@@ -17,5 +16,4 @@ CXXFLAGS += -fno-strict-aliasing
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu