From 2ce12f084113a0097fa1a0d67e2f8fe1ab70092b Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 15 Jul 2011 11:25:17 +0200 Subject: xserver libX11 mesa git update 15 July --- mesalib/configs/aix | 2 - mesalib/configs/aix-64 | 2 - mesalib/configs/aix-64-static | 1 - mesalib/configs/aix-gcc | 1 - mesalib/configs/aix-static | 1 - mesalib/configs/autoconf.in | 9 --- mesalib/configs/beos | 3 +- mesalib/configs/darwin | 5 +- mesalib/configs/default | 11 +-- mesalib/configs/freebsd | 1 - mesalib/configs/freebsd-dri | 105 ++++++++++++++------------- mesalib/configs/hpux10-gcc | 1 - mesalib/configs/hpux10-static | 2 - mesalib/configs/hpux11-32 | 2 - mesalib/configs/hpux11-32-static | 1 - mesalib/configs/hpux11-32-static-nothreads | 1 - mesalib/configs/hpux11-64 | 2 - mesalib/configs/hpux11-64-static | 1 - mesalib/configs/hpux11-ia64 | 2 - mesalib/configs/hpux11-ia64-static | 1 - mesalib/configs/irix6-64-static | 1 - mesalib/configs/irix6-n32-static | 3 +- mesalib/configs/irix6-o32-static | 3 +- mesalib/configs/linux | 1 - mesalib/configs/linux-alpha | 2 - mesalib/configs/linux-alpha-static | 3 - mesalib/configs/linux-cell | 2 +- mesalib/configs/linux-dri | 1 - mesalib/configs/linux-dri-xcb | 112 ++++++++++++++--------------- mesalib/configs/linux-fbdev | 2 - mesalib/configs/linux-ia64-icc | 2 - mesalib/configs/linux-ia64-icc-static | 3 - mesalib/configs/linux-icc | 2 - mesalib/configs/linux-icc-static | 3 - mesalib/configs/linux-indirect | 104 +++++++++++++-------------- mesalib/configs/linux-osmesa-static | 2 - mesalib/configs/linux-ppc-static | 1 - mesalib/configs/linux-static | 2 - mesalib/configs/linux-x86-64-static | 2 - mesalib/configs/linux-x86-static | 2 - mesalib/configs/netbsd | 1 - mesalib/configs/openbsd | 1 - mesalib/configs/osf1 | 1 - mesalib/configs/osf1-static | 1 - mesalib/configs/solaris-x86 | 3 +- mesalib/configs/solaris-x86-gcc | 2 - mesalib/configs/solaris-x86-gcc-static | 3 - mesalib/configs/sunos4-gcc | 1 - mesalib/configs/sunos4-static | 2 - mesalib/configs/sunos5 | 2 - mesalib/configs/sunos5-gcc | 2 - mesalib/configs/sunos5-smp | 2 - mesalib/configs/sunos5-v8 | 2 - mesalib/configs/sunos5-v8-static | 1 - mesalib/configs/sunos5-v9 | 2 - mesalib/configs/sunos5-v9-cc-g++ | 2 - mesalib/configs/sunos5-v9-static | 1 - mesalib/configs/ultrix-gcc | 2 - 58 files changed, 168 insertions(+), 270 deletions(-) (limited to 'mesalib/configs') diff --git a/mesalib/configs/aix b/mesalib/configs/aix index ebbf58374..5d346d51d 100644 --- a/mesalib/configs/aix +++ b/mesalib/configs/aix @@ -17,13 +17,11 @@ MKLIB_OPTIONS = # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = -lX11 -lXext -lpthread -lm GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC -GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -lXt -lX11 OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC diff --git a/mesalib/configs/aix-64 b/mesalib/configs/aix-64 index 5d2edc587..a048c55a9 100644 --- a/mesalib/configs/aix-64 +++ b/mesalib/configs/aix-64 @@ -15,13 +15,11 @@ LIB_DIR = lib64 # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = -lX11 -lXext -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lC -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11 APP_LIB_DEPS = -L$(TOP)/lib64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lpthread -lC diff --git a/mesalib/configs/aix-64-static b/mesalib/configs/aix-64-static index 6910e890d..ee4147f9e 100644 --- a/mesalib/configs/aix-64-static +++ b/mesalib/configs/aix-64-static @@ -16,7 +16,6 @@ LIB_DIR = lib64 # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/aix-gcc b/mesalib/configs/aix-gcc index 3b964f351..223e809b3 100644 --- a/mesalib/configs/aix-gcc +++ b/mesalib/configs/aix-gcc @@ -18,6 +18,5 @@ CXXFLAGS += -fno-strict-aliasing MKLIB_OPTIONS = -arch aix-gcc GL_LIB_DEPS = -lX11 -lXext -lm GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi diff --git a/mesalib/configs/aix-static b/mesalib/configs/aix-static index 563184344..33508481c 100644 --- a/mesalib/configs/aix-static +++ b/mesalib/configs/aix-static @@ -15,7 +15,6 @@ MKLIB_OPTIONS = -static # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in index 584f5fd77..37b7ea5bd 100644 --- a/mesalib/configs/autoconf.in +++ b/mesalib/configs/autoconf.in @@ -36,7 +36,6 @@ LLVM_CFLAGS = @LLVM_CFLAGS@ LLVM_LDFLAGS = @LLVM_LDFLAGS@ LLVM_LIBS = @LLVM_LIBS@ GLW_CFLAGS = @GLW_CFLAGS@ -GLUT_CFLAGS = @GLUT_CFLAGS@ GLX_TLS = @GLX_TLS@ DRI_CFLAGS = @DRI_CFLAGS@ DRI_CXXFLAGS = @DRI_CXXFLAGS@ @@ -67,7 +66,6 @@ BISON = @BISON@ # Library names (base name) GL_LIB = GL GLU_LIB = GLU -GLUT_LIB = glut GLW_LIB = GLw OSMESA_LIB = @OSMESA_LIB@ GLESv1_CM_LIB = GLESv1_CM @@ -80,7 +78,6 @@ GBM_LIB = gbm # Library names (actual file names) GL_LIB_NAME = @GL_LIB_NAME@ GLU_LIB_NAME = @GLU_LIB_NAME@ -GLUT_LIB_NAME = @GLUT_LIB_NAME@ GLW_LIB_NAME = @GLW_LIB_NAME@ OSMESA_LIB_NAME = @OSMESA_LIB_NAME@ EGL_LIB_NAME = @EGL_LIB_NAME@ @@ -94,7 +91,6 @@ GBM_LIB_NAME = @GBM_LIB_NAME@ # Globs used to install the lib and all symlinks GL_LIB_GLOB = @GL_LIB_GLOB@ GLU_LIB_GLOB = @GLU_LIB_GLOB@ -GLUT_LIB_GLOB = @GLUT_LIB_GLOB@ GLW_LIB_GLOB = @GLW_LIB_GLOB@ OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@ EGL_LIB_GLOB = @EGL_LIB_GLOB@ @@ -142,8 +138,6 @@ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \ EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \ $(EXTRA_LIB_PATH) @GLU_LIB_DEPS@ -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \ - $(EXTRA_LIB_PATH) @GLUT_LIB_DEPS@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \ $(EXTRA_LIB_PATH) @GLW_LIB_DEPS@ APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@ @@ -201,9 +195,6 @@ GLU_PC_REQ = @GLU_PC_REQ@ GLU_PC_REQ_PRIV = @GLU_PC_REQ_PRIV@ GLU_PC_LIB_PRIV = @GLU_PC_LIB_PRIV@ GLU_PC_CFLAGS = @GLU_PC_CFLAGS@ -GLUT_PC_REQ_PRIV = @GLUT_PC_REQ_PRIV@ -GLUT_PC_LIB_PRIV = @GLUT_PC_LIB_PRIV@ -GLUT_PC_CFLAGS = @GLUT_PC_CFLAGS@ GLW_PC_REQ_PRIV = @GLW_PC_REQ_PRIV@ GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@ GLW_PC_CFLAGS = @GLW_PC_CFLAGS@ diff --git a/mesalib/configs/beos b/mesalib/configs/beos index ac8d6fc6f..91ea6f768 100644 --- a/mesalib/configs/beos +++ b/mesalib/configs/beos @@ -90,7 +90,7 @@ else endif # Directories -SRC_DIRS = gallium mesa glu glut/beos +SRC_DIRS = gallium mesa glu GLU_DIRS = sgi DRIVER_DIRS = beos @@ -98,6 +98,5 @@ DRIVER_DIRS = beos GL_LIB_DEPS = OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = -GLUT_LIB_DEPS = -lgame -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB) diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin index 9527f61bd..41e7ba800 100644 --- a/mesalib/configs/darwin +++ b/mesalib/configs/darwin @@ -33,7 +33,6 @@ CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing -fvisibility=hidden \ # Library names (actual file names) GL_LIB_NAME = lib$(GL_LIB).dylib GLU_LIB_NAME = lib$(GLU_LIB).dylib -GLUT_LIB_NAME = lib$(GLUT_LIB).dylib GLW_LIB_NAME = lib$(GLW_LIB).dylib OSMESA_LIB_NAME = lib$(OSMESA_LIB).dylib VG_LIB_NAME = lib$(VG_LIB).dylib @@ -41,7 +40,6 @@ VG_LIB_NAME = lib$(VG_LIB).dylib # globs used to install the lib and all symlinks GL_LIB_GLOB = lib$(GL_LIB).*dylib GLU_LIB_GLOB = lib$(GLU_LIB).*dylib -GLUT_LIB_GLOB = lib$(GLUT_LIB).*dylib GLW_LIB_GLOB = lib$(GLW_LIB).*dylib OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib VG_LIB_GLOB = lib$(VG_LIB).*dylib @@ -49,12 +47,11 @@ VG_LIB_GLOB = lib$(VG_LIB).*dylib GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread OSMESA_LIB_DEPS = GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: -SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu glut/glx +SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu GLU_DIRS = sgi DRIVER_DIRS = osmesa #DRIVER_DIRS = dri diff --git a/mesalib/configs/default b/mesalib/configs/default index 132ccbee3..e839a1e50 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -54,7 +54,6 @@ INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool # Library names (base name) GL_LIB = GL GLU_LIB = GLU -GLUT_LIB = glut GLW_LIB = GLw OSMESA_LIB = OSMesa EGL_LIB = EGL @@ -68,7 +67,6 @@ GBM_LIB = gbm # Library names (actual file names) GL_LIB_NAME = lib$(GL_LIB).so GLU_LIB_NAME = lib$(GLU_LIB).so -GLUT_LIB_NAME = lib$(GLUT_LIB).so GLW_LIB_NAME = lib$(GLW_LIB).so OSMESA_LIB_NAME = lib$(OSMESA_LIB).so EGL_LIB_NAME = lib$(EGL_LIB).so @@ -82,7 +80,6 @@ GBM_LIB_NAME = lib$(GBM_LIB).so # globs used to install the lib and all symlinks GL_LIB_GLOB = $(GL_LIB_NAME)* GLU_LIB_GLOB = $(GLU_LIB_NAME)* -GLUT_LIB_GLOB = $(GLUT_LIB_NAME)* GLW_LIB_GLOB = $(GLW_LIB_NAME)* OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)* EGL_LIB_GLOB = $(EGL_LIB_NAME)* @@ -108,7 +105,7 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2 # Directories to build LIB_DIR = lib SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \ - gallium egl gallium/winsys gallium/targets glu glut/glx glw + gallium egl gallium/winsys gallium/targets glu glw GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa @@ -137,7 +134,6 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -ldl -lpthread OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread @@ -147,7 +143,7 @@ GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread WAYLAND_EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -lwayland-client -ldrm GBM_LIB_DEPS = $(EXTRA_LIB_PATH) -ludev -ldl -# Program dependencies - specific GL/glut libraries added in Makefiles +# Program dependencies - specific GL libraries added in Makefiles APP_LIB_DEPS = -lm X11_LIBS = -lX11 @@ -180,9 +176,6 @@ GLU_PC_REQ = gl GLU_PC_REQ_PRIV = GLU_PC_LIB_PRIV = GLU_PC_CFLAGS = -GLUT_PC_REQ_PRIV = -GLUT_PC_LIB_PRIV = -GLUT_PC_CFLAGS = GLW_PC_REQ_PRIV = GLW_PC_LIB_PRIV = GLW_PC_CFLAGS = diff --git a/mesalib/configs/freebsd b/mesalib/configs/freebsd index 976ddd19e..00d46be88 100644 --- a/mesalib/configs/freebsd +++ b/mesalib/configs/freebsd @@ -21,7 +21,6 @@ CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -ff CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -GLUT_CFLAGS = -fexceptions # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing diff --git a/mesalib/configs/freebsd-dri b/mesalib/configs/freebsd-dri index 3330ff1aa..fdf4b293a 100644 --- a/mesalib/configs/freebsd-dri +++ b/mesalib/configs/freebsd-dri @@ -1,53 +1,52 @@ -# -*-makefile-*- -# Configuration for freebsd-dri: FreeBSD DRI hardware drivers - -include $(TOP)/configs/freebsd - -CONFIG_NAME = freebsd-dri - -# Compiler and flags -CC = gcc -CXX = g++ -WARN_FLAGS = -Wall -OPT_FLAGS = -O -g - -EXPAT_INCLUDES = -I/usr/local/include -X11_INCLUDES = -I/usr/local/include -DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ - -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ - -DHAVE_ALIAS - -CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \ - $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES) - -CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) - -# Work around aliasing bugs - developers should comment this out -CFLAGS += -fno-strict-aliasing -CXXFLAGS += -fno-strict-aliasing - -ASM_SOURCES = -MESA_ASM_SOURCES = - -# Library/program dependencies -MESA_MODULES = $(TOP)/src/mesa/libmesa.a - -LIBDRM_CFLAGS = `pkg-config --cflags libdrm` -LIBDRM_LIB = `pkg-config --libs libdrm` -DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) -GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ - -lm -pthread $(LIBDRM_LIB) - -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 - - -# Directories -SRC_DIRS = glx gallium mesa glu glut/glx glw -DRIVER_DIRS = dri - -DRM_SOURCE_PATH=$(TOP)/../drm - -DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \ - unichrome savage sis - +# -*-makefile-*- +# Configuration for freebsd-dri: FreeBSD DRI hardware drivers + +include $(TOP)/configs/freebsd + +CONFIG_NAME = freebsd-dri + +# Compiler and flags +CC = gcc +CXX = g++ +WARN_FLAGS = -Wall +OPT_FLAGS = -O -g + +EXPAT_INCLUDES = -I/usr/local/include +X11_INCLUDES = -I/usr/local/include +DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ + -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ + -DHAVE_ALIAS + +CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \ + $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES) + +CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) + +# Work around aliasing bugs - developers should comment this out +CFLAGS += -fno-strict-aliasing +CXXFLAGS += -fno-strict-aliasing + +ASM_SOURCES = +MESA_ASM_SOURCES = + +# Library/program dependencies +MESA_MODULES = $(TOP)/src/mesa/libmesa.a + +LIBDRM_CFLAGS = `pkg-config --cflags libdrm` +LIBDRM_LIB = `pkg-config --libs libdrm` +DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) +GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -pthread $(LIBDRM_LIB) + +GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 + + +# Directories +SRC_DIRS = glx gallium mesa glu glw +DRIVER_DIRS = dri + +DRM_SOURCE_PATH=$(TOP)/../drm + +DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \ + unichrome savage sis + diff --git a/mesalib/configs/hpux10-gcc b/mesalib/configs/hpux10-gcc index be396f854..40f243c23 100644 --- a/mesalib/configs/hpux10-gcc +++ b/mesalib/configs/hpux10-gcc @@ -10,7 +10,6 @@ CXX = g++ CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE -GLUT_CFLAGS = -fexceptions # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing diff --git a/mesalib/configs/hpux10-static b/mesalib/configs/hpux10-static index 6101a4ece..18847d927 100644 --- a/mesalib/configs/hpux10-static +++ b/mesalib/configs/hpux10-static @@ -16,7 +16,6 @@ MKLIB_OPTIONS = -static # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a @@ -24,7 +23,6 @@ OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = -GLUT_LIB_DEPS = GLW_LIB_DEPS = APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++ diff --git a/mesalib/configs/hpux11-32 b/mesalib/configs/hpux11-32 index 035ef796d..d783ae021 100644 --- a/mesalib/configs/hpux11-32 +++ b/mesalib/configs/hpux11-32 @@ -18,7 +18,6 @@ MKLIB_OPTIONS = # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a @@ -26,5 +25,4 @@ OSMESA_LIB_NAME = libOSMesa.a APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lXi -lX11 -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) diff --git a/mesalib/configs/hpux11-32-static b/mesalib/configs/hpux11-32-static index b8e843618..58a1c638f 100644 --- a/mesalib/configs/hpux11-32-static +++ b/mesalib/configs/hpux11-32-static @@ -18,7 +18,6 @@ MKLIB_OPTIONS = -static # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/hpux11-32-static-nothreads b/mesalib/configs/hpux11-32-static-nothreads index cba166a08..fa3d4c2d7 100644 --- a/mesalib/configs/hpux11-32-static-nothreads +++ b/mesalib/configs/hpux11-32-static-nothreads @@ -18,7 +18,6 @@ MKLIB_OPTIONS = -static # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/hpux11-64 b/mesalib/configs/hpux11-64 index 3833c07c6..0f963e2e5 100644 --- a/mesalib/configs/hpux11-64 +++ b/mesalib/configs/hpux11-64 @@ -19,7 +19,6 @@ LIB_DIR = lib64 # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a @@ -27,5 +26,4 @@ OSMESA_LIB_NAME = libOSMesa.a APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) diff --git a/mesalib/configs/hpux11-64-static b/mesalib/configs/hpux11-64-static index 32944f928..4161d535f 100644 --- a/mesalib/configs/hpux11-64-static +++ b/mesalib/configs/hpux11-64-static @@ -19,7 +19,6 @@ LIB_DIR = lib64 # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/hpux11-ia64 b/mesalib/configs/hpux11-ia64 index b94560baf..e27a22101 100644 --- a/mesalib/configs/hpux11-ia64 +++ b/mesalib/configs/hpux11-ia64 @@ -19,12 +19,10 @@ LIB_DIR = lib64 # Library names (actual file names) GL_LIB_NAME = libGL.so GLU_LIB_NAME = libGLU.so -GLUT_LIB_NAME = libglut.so GLW_LIB_NAME = libGLw.so OSMESA_LIB_NAME = libOSMesa.so # Library/program dependencies GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS) GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) diff --git a/mesalib/configs/hpux11-ia64-static b/mesalib/configs/hpux11-ia64-static index e094c9f87..de24a1514 100644 --- a/mesalib/configs/hpux11-ia64-static +++ b/mesalib/configs/hpux11-ia64-static @@ -19,7 +19,6 @@ LIB_DIR = lib64 # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/irix6-64-static b/mesalib/configs/irix6-64-static index ea9dabcc0..e61f6247b 100644 --- a/mesalib/configs/irix6-64-static +++ b/mesalib/configs/irix6-64-static @@ -19,7 +19,6 @@ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -l GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/irix6-n32-static b/mesalib/configs/irix6-n32-static index fe47ccdcb..47b5e5067 100644 --- a/mesalib/configs/irix6-n32-static +++ b/mesalib/configs/irix6-n32-static @@ -15,11 +15,10 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = lib32 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/irix6-o32-static b/mesalib/configs/irix6-o32-static index 2d265df98..58fbe4e8e 100644 --- a/mesalib/configs/irix6-o32-static +++ b/mesalib/configs/irix6-o32-static @@ -15,11 +15,10 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c LIB_DIR = lib32 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/linux b/mesalib/configs/linux index c60f0d8ac..2560973fa 100644 --- a/mesalib/configs/linux +++ b/mesalib/configs/linux @@ -33,6 +33,5 @@ CXXFLAGS = -Wall -Wpointer-arith $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \ CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing -GLUT_CFLAGS = -fexceptions EXTRA_LIB_PATH = -L/usr/X11R6/lib diff --git a/mesalib/configs/linux-alpha b/mesalib/configs/linux-alpha index 65bf0c2ab..803873979 100644 --- a/mesalib/configs/linux-alpha +++ b/mesalib/configs/linux-alpha @@ -9,14 +9,12 @@ CC = gcc CXX = g++ CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -GLUT_CFLAGS = -fexceptions # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/mesalib/configs/linux-alpha-static b/mesalib/configs/linux-alpha-static index 53808d77c..33938e85b 100644 --- a/mesalib/configs/linux-alpha-static +++ b/mesalib/configs/linux-alpha-static @@ -9,7 +9,6 @@ CC = gcc CXX = g++ CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -GLUT_CFLAGS = -fexceptions MKLIB_OPTIONS = -static PIC_FLAGS = @@ -20,12 +19,10 @@ CXXFLAGS += -fno-strict-aliasing # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm diff --git a/mesalib/configs/linux-cell b/mesalib/configs/linux-cell index 606a11a8c..e87e69a80 100644 --- a/mesalib/configs/linux-cell +++ b/mesalib/configs/linux-cell @@ -38,7 +38,7 @@ CXXFLAGS = $(COMMON_C_CPP_FLAGS) # Omitting glw here: SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \ - gallium gallium/winsys gallium/targets glu glut/glx + gallium gallium/winsys gallium/targets glu # Build no traditional Mesa drivers: DRIVER_DIRS = diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri index c4132f472..b82481e0f 100644 --- a/mesalib/configs/linux-dri +++ b/mesalib/configs/linux-dri @@ -32,7 +32,6 @@ CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) -GLUT_CFLAGS = -fexceptions # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing diff --git a/mesalib/configs/linux-dri-xcb b/mesalib/configs/linux-dri-xcb index 292788990..021aa3e8b 100644 --- a/mesalib/configs/linux-dri-xcb +++ b/mesalib/configs/linux-dri-xcb @@ -1,56 +1,56 @@ -# -*-makefile-*- -# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others - -include $(TOP)/configs/default - -CONFIG_NAME = linux-dri-xcb - -# Compiler and flags -CC = gcc -CXX = g++ - -#MKDEP = /usr/X11R6/bin/makedepend -#MKDEP = gcc -M -#MKDEP_OPTIONS = -MF depend - -OPT_FLAGS = -g -PIC_FLAGS = -fPIC - -# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. -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_INDIRECT_RENDERING \ - -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN - -X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx) - -CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \ - $(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math - -CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) - -# Work around aliasing bugs - developers should comment this out -CFLAGS += -fno-strict-aliasing -CXXFLAGS += -fno-strict-aliasing - -MESA_ASM_SOURCES = - -# Library/program dependencies -EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11) - -MESA_MODULES = $(TOP)/src/mesa/libmesa.a - -LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) -LIBDRM_LIB = $(shell pkg-config --libs libdrm) -DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ - $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx) - -SRC_DIRS = glx gallium mesa glu glut/glx glw - -DRIVER_DIRS = dri -DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \ - savage sis tdfx unichrome +# -*-makefile-*- +# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others + +include $(TOP)/configs/default + +CONFIG_NAME = linux-dri-xcb + +# Compiler and flags +CC = gcc +CXX = g++ + +#MKDEP = /usr/X11R6/bin/makedepend +#MKDEP = gcc -M +#MKDEP_OPTIONS = -MF depend + +OPT_FLAGS = -g +PIC_FLAGS = -fPIC + +# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. +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_INDIRECT_RENDERING \ + -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN + +X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx) + +CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \ + $(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math + +CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) + +# Work around aliasing bugs - developers should comment this out +CFLAGS += -fno-strict-aliasing +CXXFLAGS += -fno-strict-aliasing + +MESA_ASM_SOURCES = + +# Library/program dependencies +EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11) + +MESA_MODULES = $(TOP)/src/mesa/libmesa.a + +LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) +LIBDRM_LIB = $(shell pkg-config --libs libdrm) +DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ + $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx) + +SRC_DIRS = glx gallium mesa glu glw + +DRIVER_DIRS = dri +DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \ + savage sis tdfx unichrome diff --git a/mesalib/configs/linux-fbdev b/mesalib/configs/linux-fbdev index 4fc638404..45b482a91 100644 --- a/mesalib/configs/linux-fbdev +++ b/mesalib/configs/linux-fbdev @@ -9,10 +9,8 @@ CFLAGS += -DUSE_GLFBDEV_DRIVER # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing -SRC_DIRS += glut/fbdev DRIVER_DIRS = fbdev osmesa GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread OSMESA_LIB_DEPS = -lm -lpthread -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm diff --git a/mesalib/configs/linux-ia64-icc b/mesalib/configs/linux-ia64-icc index bd1189775..1594256c5 100644 --- a/mesalib/configs/linux-ia64-icc +++ b/mesalib/configs/linux-ia64-icc @@ -9,12 +9,10 @@ CC = icc CXX = icpc CFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include CXXFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -GLUT_CFLAGS = -fexceptions MKLIB_OPTIONS = -arch icc-istatic GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS) APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) diff --git a/mesalib/configs/linux-ia64-icc-static b/mesalib/configs/linux-ia64-icc-static index ce8daf1d7..b5c33a525 100644 --- a/mesalib/configs/linux-ia64-icc-static +++ b/mesalib/configs/linux-ia64-icc-static @@ -9,19 +9,16 @@ CC = icc CXX = icpc CFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include CXXFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -GLUT_CFLAGS = -fexceptions MKLIB_OPTIONS = -static -arch icc-istatic # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = GLU_LIB_DEPS = -GLUT_LIB_DEPS = GLW_LIB_DEPS = APP_LIB_DEPS = -i-static -cxxlib-icc -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lpthread -lm -lcxa -lunwind diff --git a/mesalib/configs/linux-icc b/mesalib/configs/linux-icc index d90a1dab3..2cfb2025f 100644 --- a/mesalib/configs/linux-icc +++ b/mesalib/configs/linux-icc @@ -9,11 +9,9 @@ CC = icc CXX = g++ CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include CXXFLAGS = -O3 -GLUT_CFLAGS = -fexceptions MKLIB_OPTIONS = -arch icc GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm MESA_ASM_SOURCES = $(X86_SOURCES) diff --git a/mesalib/configs/linux-icc-static b/mesalib/configs/linux-icc-static index 384db3bfe..d0311962a 100644 --- a/mesalib/configs/linux-icc-static +++ b/mesalib/configs/linux-icc-static @@ -9,18 +9,15 @@ CC = icc CXX = icpc CFLAGS = -O3 -tpp6 -axK -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include CXXFLAGS = -O3 -tpp6 -axK -DPTHREADS -GLUT_CFLAGS = -fexceptions MKLIB_OPTIONS = -static -arch icc # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = -GLUT_LIB_DEPS = APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind MESA_ASM_SOURCES = $(X86_SOURCES) diff --git a/mesalib/configs/linux-indirect b/mesalib/configs/linux-indirect index 8a31bcd87..82868c4a1 100644 --- a/mesalib/configs/linux-indirect +++ b/mesalib/configs/linux-indirect @@ -1,52 +1,52 @@ -# -*-makefile-*- -# Configuration for linux-indirect: Builds a libGL capable of indirect -# rendering, but *NOT* capable of direct rendering. - -include $(TOP)/configs/default - -CONFIG_NAME = linux-dri - -# Compiler and flags -CC = gcc -CXX = g++ - -#MKDEP = /usr/X11R6/bin/makedepend -#MKDEP = gcc -M -#MKDEP_OPTIONS = -MF depend - -WARN_FLAGS = -Wall -OPT_FLAGS = -O -g -PIC_FLAGS = -fPIC - -# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. -ARCH_FLAGS ?= - -DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ - -D_BSD_SOURCE -D_GNU_SOURCE \ - -DGLX_INDIRECT_RENDERING \ - -DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN - -X11_INCLUDES = -I/usr/X11R6/include - -CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ - $(ASM_FLAGS) -std=c99 -ffast-math - -CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) - -# Work around aliasing bugs - developers should comment this out -CFLAGS += -fno-strict-aliasing -CXXFLAGS += -fno-strict-aliasing - -MESA_ASM_SOURCES = - -# Library/program dependencies -EXTRA_LIB_PATH=-L/usr/X11R6/lib - -MESA_MODULES = $(TOP)/src/mesa/libmesa.a -DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl - - -# Directories -SRC_DIRS = glx glu glut/glx glw -DRIVER_DIRS = +# -*-makefile-*- +# Configuration for linux-indirect: Builds a libGL capable of indirect +# rendering, but *NOT* capable of direct rendering. + +include $(TOP)/configs/default + +CONFIG_NAME = linux-dri + +# Compiler and flags +CC = gcc +CXX = g++ + +#MKDEP = /usr/X11R6/bin/makedepend +#MKDEP = gcc -M +#MKDEP_OPTIONS = -MF depend + +WARN_FLAGS = -Wall +OPT_FLAGS = -O -g +PIC_FLAGS = -fPIC + +# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. +ARCH_FLAGS ?= + +DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ + -D_BSD_SOURCE -D_GNU_SOURCE \ + -DGLX_INDIRECT_RENDERING \ + -DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN + +X11_INCLUDES = -I/usr/X11R6/include + +CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ + $(ASM_FLAGS) -std=c99 -ffast-math + +CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) + +# Work around aliasing bugs - developers should comment this out +CFLAGS += -fno-strict-aliasing +CXXFLAGS += -fno-strict-aliasing + +MESA_ASM_SOURCES = + +# Library/program dependencies +EXTRA_LIB_PATH=-L/usr/X11R6/lib + +MESA_MODULES = $(TOP)/src/mesa/libmesa.a +DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl + + +# Directories +SRC_DIRS = glx glu glw +DRIVER_DIRS = diff --git a/mesalib/configs/linux-osmesa-static b/mesalib/configs/linux-osmesa-static index 722079463..d3af7a9d3 100644 --- a/mesalib/configs/linux-osmesa-static +++ b/mesalib/configs/linux-osmesa-static @@ -17,7 +17,6 @@ MKLIB_OPTIONS = -static # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a @@ -30,7 +29,6 @@ DRIVER_DIRS = osmesa GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = -GLUT_LIB_DEPS = GLW_LIB_DEPS = APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm diff --git a/mesalib/configs/linux-ppc-static b/mesalib/configs/linux-ppc-static index 3f3dc5564..0a4ba43cc 100644 --- a/mesalib/configs/linux-ppc-static +++ b/mesalib/configs/linux-ppc-static @@ -10,6 +10,5 @@ PIC_FLAGS = # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/linux-static b/mesalib/configs/linux-static index 907904bda..2b97daad8 100644 --- a/mesalib/configs/linux-static +++ b/mesalib/configs/linux-static @@ -10,7 +10,6 @@ PIC_FLAGS = # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a @@ -18,7 +17,6 @@ OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = -GLUT_LIB_DEPS = GLW_LIB_DEPS = # Need to specify all libraries we may need diff --git a/mesalib/configs/linux-x86-64-static b/mesalib/configs/linux-x86-64-static index 626d579ac..89a0e3e03 100644 --- a/mesalib/configs/linux-x86-64-static +++ b/mesalib/configs/linux-x86-64-static @@ -10,7 +10,6 @@ PIC_FLAGS = # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a @@ -18,7 +17,6 @@ OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = -GLUT_LIB_DEPS = GLW_LIB_DEPS = # Need to specify all libraries we may need diff --git a/mesalib/configs/linux-x86-static b/mesalib/configs/linux-x86-static index 16c8731c1..dba6299e4 100644 --- a/mesalib/configs/linux-x86-static +++ b/mesalib/configs/linux-x86-static @@ -10,7 +10,6 @@ PIC_FLAGS = # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a @@ -18,7 +17,6 @@ OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = -GLUT_LIB_DEPS = GLW_LIB_DEPS = # Need to specify all libraries we may need diff --git a/mesalib/configs/netbsd b/mesalib/configs/netbsd index aec456950..c65e90199 100644 --- a/mesalib/configs/netbsd +++ b/mesalib/configs/netbsd @@ -9,7 +9,6 @@ CC = gcc CXX = g++ CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100 CXXFLAGS = -O2 -fPIC -GLUT_CFLAGS = -fexceptions APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm # Work around aliasing bugs - developers should comment this out diff --git a/mesalib/configs/openbsd b/mesalib/configs/openbsd index bd19fa84d..982675fa2 100644 --- a/mesalib/configs/openbsd +++ b/mesalib/configs/openbsd @@ -17,6 +17,5 @@ CXXFLAGS += -fno-strict-aliasing GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm OSMESA_LIB_DEPS = -lm GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/mesalib/configs/osf1 b/mesalib/configs/osf1 index 88a2ecc73..5a2e1f2ec 100644 --- a/mesalib/configs/osf1 +++ b/mesalib/configs/osf1 @@ -12,5 +12,4 @@ CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT GL_LIB_DEPS = -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) -lX11 -lXmu -lXt -lXi -lm APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm diff --git a/mesalib/configs/osf1-static b/mesalib/configs/osf1-static index e00f7ce01..f20005da1 100644 --- a/mesalib/configs/osf1-static +++ b/mesalib/configs/osf1-static @@ -13,5 +13,4 @@ MKLIB_OPTIONS = -static GL_LIB_DEPS = GLU_LIB_DEPS = -GLUT_LIB_DEPS = APP_LIB_DEPS = -noso -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -so_archive -lX11 -lXext -lXmu -lXi -lpthread -lm -lcxx diff --git a/mesalib/configs/solaris-x86 b/mesalib/configs/solaris-x86 index a5a7a63fa..3c64d35a1 100644 --- a/mesalib/configs/solaris-x86 +++ b/mesalib/configs/solaris-x86 @@ -9,10 +9,9 @@ CC = cc CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM MKLIB_OPTIONS = -static -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lglut -lGLU -lGL +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lGLU -lGL GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a 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 diff --git a/mesalib/configs/solaris-x86-gcc-static b/mesalib/configs/solaris-x86-gcc-static index 4850284a5..dd12084b7 100644 --- a/mesalib/configs/solaris-x86-gcc-static +++ b/mesalib/configs/solaris-x86-gcc-static @@ -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 MKLIB_OPTIONS = -static # Work around aliasing bugs - developers should comment this out @@ -18,11 +17,9 @@ 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 GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a diff --git a/mesalib/configs/sunos4-gcc b/mesalib/configs/sunos4-gcc index 094229158..85439c93b 100644 --- a/mesalib/configs/sunos4-gcc +++ b/mesalib/configs/sunos4-gcc @@ -9,7 +9,6 @@ CC = gcc CXX = g++ CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4 CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4 -GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing diff --git a/mesalib/configs/sunos4-static b/mesalib/configs/sunos4-static index 9135fa7df..b05184d46 100644 --- a/mesalib/configs/sunos4-static +++ b/mesalib/configs/sunos4-static @@ -12,7 +12,6 @@ MKLIB_OPTIONS = -static # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a @@ -20,6 +19,5 @@ OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = -GLUT_LIB_DEPS = GLW_LIB_DEPS = APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm diff --git a/mesalib/configs/sunos5 b/mesalib/configs/sunos5 index 6dd7539c6..b3d3fc6ed 100644 --- a/mesalib/configs/sunos5 +++ b/mesalib/configs/sunos5 @@ -9,10 +9,8 @@ CC = cc CXX = c++ CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -GLUT_CFLAGS = -DSOLARIS_2_4_BUG GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lCrun -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/mesalib/configs/sunos5-gcc b/mesalib/configs/sunos5-gcc index 571ff24a2..e4d340363 100644 --- a/mesalib/configs/sunos5-gcc +++ b/mesalib/configs/sunos5-gcc @@ -26,7 +26,6 @@ CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ -I/usr/openwin/include -GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing @@ -36,5 +35,4 @@ CXXFLAGS += -fno-strict-aliasing EXTRA_LIB_PATH=-L/usr/openwin/lib GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXi -lm -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/mesalib/configs/sunos5-smp b/mesalib/configs/sunos5-smp index 274080590..93132b643 100644 --- a/mesalib/configs/sunos5-smp +++ b/mesalib/configs/sunos5-smp @@ -9,11 +9,9 @@ CC = cc CXX = c++ CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -GLUT_CFLAGS = -DSOLARIS_2_4_BUG GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lCrun diff --git a/mesalib/configs/sunos5-v8 b/mesalib/configs/sunos5-v8 index cdaf3eee7..19ff67b15 100644 --- a/mesalib/configs/sunos5-v8 +++ b/mesalib/configs/sunos5-v8 @@ -9,10 +9,8 @@ CC = cc CXX = CC CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS -GLUT_CFLAGS = -DSOLARIS_2_4_BUG GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/mesalib/configs/sunos5-v8-static b/mesalib/configs/sunos5-v8-static index 5e428b1a5..edb3227c5 100644 --- a/mesalib/configs/sunos5-v8-static +++ b/mesalib/configs/sunos5-v8-static @@ -11,6 +11,5 @@ CC = cc CXX = CC CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS -GLUT_CFLAGS = -DSOLARIS_2_4_BUG APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun diff --git a/mesalib/configs/sunos5-v9 b/mesalib/configs/sunos5-v9 index ea2ab23e2..28b402ee1 100644 --- a/mesalib/configs/sunos5-v9 +++ b/mesalib/configs/sunos5-v9 @@ -13,11 +13,9 @@ CC = cc CXX = CC CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS -GLUT_CFLAGS = -DSOLARIS_2_4_BUG GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/mesalib/configs/sunos5-v9-cc-g++ b/mesalib/configs/sunos5-v9-cc-g++ index 8656251e3..a303f891d 100644 --- a/mesalib/configs/sunos5-v9-cc-g++ +++ b/mesalib/configs/sunos5-v9-cc-g++ @@ -26,10 +26,8 @@ CXXFLAGS += -fno-strict-aliasing CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS #CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS -GLUT_CFLAGS = -DSOLARIS_2_4_BUG GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/mesalib/configs/sunos5-v9-static b/mesalib/configs/sunos5-v9-static index 4919570c7..ccf5eb3ce 100644 --- a/mesalib/configs/sunos5-v9-static +++ b/mesalib/configs/sunos5-v9-static @@ -13,6 +13,5 @@ CC = cc CXX = CC CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS -GLUT_CFLAGS = -DSOLARIS_2_4_BUG APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun diff --git a/mesalib/configs/ultrix-gcc b/mesalib/configs/ultrix-gcc index 455b6932d..4414e7acd 100644 --- a/mesalib/configs/ultrix-gcc +++ b/mesalib/configs/ultrix-gcc @@ -9,7 +9,6 @@ CC = gcc CXX = g++ CFLAGS = -pedantic -O2 CXXFLAGS = -pedantic -O2 -GLUT_CFLAGS = -fexceptions MKLIB_OPTIONS = -static # Work around aliasing bugs - developers should comment this out @@ -18,7 +17,6 @@ CXXFLAGS += -fno-strict-aliasing GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a -- cgit v1.2.3