diff options
| author | David Nusinow <dnusinow@debian.org> | 2005-12-30 20:12:45 +0000 |
|---|---|---|
| committer | David Nusinow <dnusinow@debian.org> | 2005-12-30 20:12:45 +0000 |
| commit | bda1e332ce5efe2057421dec58202b43707a504c (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /configs | |
| parent | 53b2ad5fd0aaff8cbd605d337b862f12debb26cb (diff) | |
Update libs to 7.0 release with packaging
Diffstat (limited to 'configs')
99 files changed, 0 insertions, 2081 deletions
diff --git a/configs/CVS/Entries b/configs/CVS/Entries deleted file mode 100644 index a1be3698aa4..00000000000 --- a/configs/CVS/Entries +++ /dev/null @@ -1,78 +0,0 @@ -/aix/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/aix-64/1.2/Fri Oct 1 16:29:39 2004//Tmesa_6_4_branch -/aix-gcc/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/aix-static/1.1/Thu Jul 1 15:32:51 2004//Tmesa_6_4_branch -/beos/1.5/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/darwin/1.3/Thu Jun 30 02:34:07 2005//Tmesa_6_4_branch -/darwin-static/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/freebsd-dri-amd64/1.2/Sat Jul 2 08:29:57 2005//Tmesa_6_4_branch -/freebsd-dri-x86/1.1/Thu Oct 28 00:19:21 2004//Tmesa_6_4_branch -/hpux10/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/hpux10-gcc/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/hpux10-static/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/hpux11-32/1.1/Fri Oct 1 20:18:42 2004//Tmesa_6_4_branch -/hpux11-32-static/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/hpux11-32-static-nothreads/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/hpux11-64/1.1/Fri Oct 1 20:18:42 2004//Tmesa_6_4_branch -/hpux11-64-static/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/hpux9/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/hpux9-gcc/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/irix6-64/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/irix6-64-static/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/irix6-n32/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/irix6-n32-static/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/irix6-o32/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/irix6-o32-static/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-alpha/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-alpha-static/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-directfb/1.1/Mon Jan 3 15:35:01 2005//Tmesa_6_4_branch -/linux-dri-ppc/1.3/Fri Aug 19 20:20:03 2005//Tmesa_6_4_branch -/linux-dri-x86/1.11/Fri Jul 15 14:31:31 2005//Tmesa_6_4_branch -/linux-dri-x86-64/1.18/Fri Aug 19 20:20:03 2005//Tmesa_6_4_branch -/linux-fbdev/1.2/Thu May 5 13:07:52 2005//Tmesa_6_4_branch -/linux-glide/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-icc/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-icc-static/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-indirect/1.4/Mon Aug 15 15:01:39 2005//Tmesa_6_4_branch -/linux-osmesa16/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/linux-osmesa16-static/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/linux-osmesa32/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/linux-ppc/1.3/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch -/linux-ppc-static/1.3/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch -/linux-profile/1.1/Fri Apr 15 22:16:18 2005//Tmesa_6_4_branch -/linux-solo/1.22/Fri Aug 5 03:48:15 2005//Tmesa_6_4_branch -/linux-solo-ia64/1.8/Tue Jul 26 05:57:24 2005//Tmesa_6_4_branch -/linux-solo-x86/1.8/Thu May 26 03:47:34 2005//Tmesa_6_4_branch -/linux-sparc/1.3/Thu Jul 28 00:11:10 2005//Tmesa_6_4_branch -/linux-sparc5/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-static/1.3/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch -/linux-tcc/1.5/Sat Nov 27 04:50:34 2004//Tmesa_6_4_branch -/linux-ultrasparc/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-x86-32/1.4/Fri Jul 8 21:55:56 2005//Tmesa_6_4_branch -/linux-x86-64/1.9/Sat Jul 2 08:29:57 2005//Tmesa_6_4_branch -/linux-x86-64-debug/1.2/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch -/linux-x86-64-static/1.6/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch -/linux-x86-debug/1.2/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch -/linux-x86-glide/1.4/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-x86-static/1.5/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch -/linux-x86-xcb/1.1/Sat May 7 17:21:11 2005//Tmesa_6_4_branch -/netbsd/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/openbsd/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/osf1/1.3/Mon Nov 15 16:54:14 2004//Tmesa_6_4_branch -/solaris-x86/1.2/Tue Jun 7 15:30:12 2005//Tmesa_6_4_branch -/solaris-x86-gcc/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/sunos4/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/sunos4-gcc/1.1/Fri Mar 26 15:16:35 2004//Tmesa_6_4_branch -/sunos4-static/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/sunos5/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/sunos5-gcc/1.4/Thu Jul 28 00:11:10 2005//Tmesa_6_4_branch -/sunos5-smp/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/ultrix-gcc/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/freebsd/1.2.8.1/Mon Aug 29 22:44:20 2005//Tmesa_6_4_branch -/linux-dri/1.34/Wed Oct 19 01:51:53 2005//Tmesa_6_4_branch -/freebsd-dri/1.12.2.1/Mon Oct 24 23:11:57 2005//Tmesa_6_4_branch -/default/1.21.2.2/Mon Oct 24 23:35:14 2005//Tmesa_6_4_branch -/linux-debug/1.6/Wed Nov 2 15:55:04 2005//Tmesa_6_4_branch -/linux-x86/1.6/Wed Nov 2 19:44:59 2005//Tmesa_6_4_branch -/linux/1.4/Mon Nov 21 16:05:02 2005//Tmesa_6_4_branch -D diff --git a/configs/CVS/Repository b/configs/CVS/Repository deleted file mode 100644 index 467347235d9..00000000000 --- a/configs/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -Mesa/configs diff --git a/configs/CVS/Root b/configs/CVS/Root deleted file mode 100644 index eba07540827..00000000000 --- a/configs/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:ext:brianp@pdx.freedesktop.org:/cvs/mesa diff --git a/configs/CVS/Tag b/configs/CVS/Tag deleted file mode 100644 index 278d2508cc2..00000000000 --- a/configs/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -Tmesa_6_4_branch diff --git a/configs/CVS/Template b/configs/CVS/Template deleted file mode 100644 index e69de29bb2d..00000000000 --- a/configs/CVS/Template +++ /dev/null diff --git a/configs/aix b/configs/aix deleted file mode 100644 index fe8e48cd654..00000000000 --- a/configs/aix +++ /dev/null @@ -1,28 +0,0 @@ -# Configuration for AIX, dynamic libs - -include $(TOP)/configs/default - -CONFIG_NAME = aix - -# Compiler and flags -CC = cc -CXX = xlC - -CFLAGS = -O -DAIXV3 -CXXFLAGS = -O -DAIXV3 -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 -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) -lXt -lX11 -OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC - diff --git a/configs/aix-64 b/configs/aix-64 deleted file mode 100644 index 0d98475293c..00000000000 --- a/configs/aix-64 +++ /dev/null @@ -1,28 +0,0 @@ -# Configuration for AIX 64-bit, dynamic libs - -include $(TOP)/configs/default - -CONFIG_NAME = aix-64 - -# Compiler and flags -CC = xlc -CXX = xlC - -CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -MKLIB_OPTIONS = -arch AIX64 - -# 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 -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) -lXt -lX11 -OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC - diff --git a/configs/aix-gcc b/configs/aix-gcc deleted file mode 100644 index 5f10bf25dce..00000000000 --- a/configs/aix-gcc +++ /dev/null @@ -1,19 +0,0 @@ -# Configuration for AIX with gcc - -include $(TOP)/configs/default - -CONFIG_NAME = aix-gcc - -# Compiler and flags -CC = gcc -CXX = g++ - -CFLAGS = -O2 -DAIXV3 -CXXFLAGS = -O2 -DAIXV3 - -MKLIB_OPTIONS = -arch aix-gcc -GL_LIB_DEPS = -lX11 -lXext -lm -GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(LIB_DIR -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -APP_LIB_DEPS = -L$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi - diff --git a/configs/aix-static b/configs/aix-static deleted file mode 100644 index f6f086edb6a..00000000000 --- a/configs/aix-static +++ /dev/null @@ -1,23 +0,0 @@ -# Configuration for AIX, static libs - -include $(TOP)/configs/default - -CONFIG_NAME = aix-static - -# Compiler and flags -CC = cc -CXX = xlC - -CFLAGS = -O -DAIXV3 -CXXFLAGS = -O -DAIXV3 -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 - -APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm - diff --git a/configs/beos b/configs/beos deleted file mode 100644 index 1d2eaa95995..00000000000 --- a/configs/beos +++ /dev/null @@ -1,99 +0,0 @@ -# Configuration for BeOS -# Written by Philippe Houdoin - -include $(TOP)/configs/default - -CONFIG_NAME = beos - - -DEFINES = \ - -DBEOS_THREADS - -MACHINE=$(shell uname -m) -ifeq ($(MACHINE), BePC) - CPU = x86 -else - CPU = ppc -endif - -ifeq ($(CPU), x86) - # BeOS x86 settings - - DEFINES += \ - -DGNU_ASSEMBLER \ - -DUSE_X86_ASM \ - -DUSE_MMX_ASM \ - -DUSE_3DNOW_ASM \ - -DUSE_SSE_ASM - - ASM_SOURCES = $(X86_SOURCES) $(X86_API) - - CC = gcc - CXX = g++ - LD = gcc - - CFLAGS = \ - -Wall -Wno-multichar -Wno-ctor-dtor-privacy \ - $(DEFINES) - - CXXFLAGS = $(CFLAGS) - - LDFLAGS += -Xlinker - - ifdef DEBUG - CFLAGS += -g -O0 - LDFLAGS += -g - DEFINES += -DDEBUG - else - CFLAGS += -O3 - endif - - GLUT_CFLAGS = -fexceptions - -else - # BeOS PPC settings - - CC = mwcc - CXX = $(CC) - LD = mwldppc - - CFLAGS = \ - -w on -requireprotos \ - $(DEFINES) - - CXXFLAGS = $(CFLAGS) - - LDFLAGS += \ - -export pragma \ - -init _init_routine_ \ - -term _term_routine_ \ - -lroot \ - /boot/develop/lib/ppc/glue-noinit.a \ - /boot/develop/lib/ppc/init_term_dyn.o \ - /boot/develop/lib/ppc/start_dyn.o - - ifdef DEBUG - CFLAGS += -g -O0 - CXXFLAGS += -g -O0 - LDFLAGS += -g - else - CFLAGS += -O7 - CXXFLAGS += -O7 - endif - - GLUT_CFLAGS = -fexceptions -endif - -# Directories -SRC_DIRS = mesa glu glut/beos -GLU_DIRS = sgi -DRIVER_DIRS = beos -PROGRAM_DIRS = beos samples redbook demos tests - -# Library/program dependencies -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -GLU_LIB_DEPS = -GLUT_LIB_DEPS = -lgame -L$(LIB_DIR) -l$(GL_LIB) -APP_LIB_DEPS = -lbe -L$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB) - diff --git a/configs/darwin b/configs/darwin deleted file mode 100644 index 0c8a6ec47a7..00000000000 --- a/configs/darwin +++ /dev/null @@ -1,29 +0,0 @@ -# Configuration for Darwin / MacOS X, making dynamic libs - -include $(TOP)/configs/default - -CONFIG_NAME = darwin - -# Compiler and flags -CC = cc -CXX = cc -CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin -CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin - -# Library names (actual file names) -GL_LIB_NAME = libGL.dylib -GLU_LIB_NAME = libGLU.dylib -GLUT_LIB_NAME = libglut.dylib -GLW_LIB_NAME = libGLw.dylib -OSMESA_LIB_NAME = libOSMesa.dylib - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL -GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -GLUT_LIB_DEPS = -L$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext -GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib -APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm - -# omit glw lib for now: -SRC_DIRS = mesa glu glut/glx - diff --git a/configs/darwin-static b/configs/darwin-static deleted file mode 100644 index c7f9c5f06be..00000000000 --- a/configs/darwin-static +++ /dev/null @@ -1,24 +0,0 @@ -# Configuration for Darwin / MacOS X, making static libs - -include $(TOP)/configs/darwin - -CONFIG_NAME = darwin-static - -# Compiler and flags -CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin -CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin -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 - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -GLUT_LIB_DEPS = -GLW_LIB_DEPS = -APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm diff --git a/configs/debian b/configs/debian deleted file mode 100644 index 79ca0a769c8..00000000000 --- a/configs/debian +++ /dev/null @@ -1,22 +0,0 @@ -include $(TOP)/configs/default - -CONFIG_NAME = debian - -CC = cc -CXX = c++ - -DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include - -DEBIAN_COMMON_CFLAGS = -ansi -pedantic -Wall -fPIC -std=c99 - -DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall -fPIC - -DEBIAN_OPT_CFLAGS = -O2 - -CFLAGS = $(DEBIAN_COMMON_CPPFLAGS) $(DEBIAN_COMMON_CFLAGS) $(DEBIAN_OPT_CFLAGS) -CXXFLAGS = $(DEBIAN_COMMON_CPPFLAGS) $(DEBIAN_COMMON_CXXFLAGS) $(DEBIAN_OPT_CFLAGS) - -GLW_SOURCES += GLwMDrawA.c - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 -lXm diff --git a/configs/debian-debug b/configs/debian-debug deleted file mode 100644 index d199c5d894c..00000000000 --- a/configs/debian-debug +++ /dev/null @@ -1,7 +0,0 @@ -include $(TOP)/configs/debian - -CONFIG_NAME = debian-debug - -DEBIAN_COMMON_CPPFLAGS += -DDEBUG -DMESA_DEBUG - -DEBIAN_OPT_CFLAGS = diff --git a/configs/debian-debug_i386 b/configs/debian-debug_i386 deleted file mode 100644 index b9e0eebbd3f..00000000000 --- a/configs/debian-debug_i386 +++ /dev/null @@ -1,7 +0,0 @@ -include $(TOP)/configs/debian-debug - -CONFIG_NAME = debian-debug-i386 - -DEBIAN_OPT_CFLAGS = -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM - -ASM_SOURCES = $(X86_SOURCES) $(X86_API) diff --git a/configs/debian-directfb b/configs/debian-directfb deleted file mode 100644 index 6d6c542a321..00000000000 --- a/configs/debian-directfb +++ /dev/null @@ -1,7 +0,0 @@ -include $(TOP)/configs/debian - -CONFIG_NAME = debian-directfb - -GL_LIB_DEPS = -lm -lpthread - -DRIVER_DIRS = directfb diff --git a/configs/debian-dri b/configs/debian-dri deleted file mode 100644 index db73fcd25b9..00000000000 --- a/configs/debian-dri +++ /dev/null @@ -1,25 +0,0 @@ -include $(TOP)/configs/debian - -CONFIG_NAME = debian-dri - -DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DDEFAULT_DRIVER_DIR=\"/usr/lib/dri\" - -LIBDRM_LIB = `pkg-config --libs libdrm` -DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread -ldl $(LIBDRM_LIB) - -USING_EGL=0 - -# Directories -ifeq ($(USING_EGL), 1) -override SRC_DIRS = egl glx/x11 mesa -PROGRAM_DIRS = egl -else -override SRC_DIRS = glx/x11 mesa -PROGRAM_DIRS = -endif - -DRIVER_DIRS = dri -WINDOW_SYSTEM=dri - -DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb diff --git a/configs/debian-dri-amd64 b/configs/debian-dri-amd64 deleted file mode 100644 index e2cf49695a0..00000000000 --- a/configs/debian-dri-amd64 +++ /dev/null @@ -1,5 +0,0 @@ -include $(TOP)/configs/debian-dri - -CONFIG_NAME = debian-dri-amd64 - -DRI_DIRS = i915 mach64 mga r128 r200 r300 radeon savage tdfx unichrome diff --git a/configs/debian-dri-i386 b/configs/debian-dri-i386 deleted file mode 100644 index 3a537c1a6de..00000000000 --- a/configs/debian-dri-i386 +++ /dev/null @@ -1,5 +0,0 @@ -include $(TOP)/configs/debian-dri - -CONFIG_NAME = debian-dri-i386 - -DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome diff --git a/configs/debian-dri-powerpc b/configs/debian-dri-powerpc deleted file mode 100644 index 9b6cdad4297..00000000000 --- a/configs/debian-dri-powerpc +++ /dev/null @@ -1,5 +0,0 @@ -include $(TOP)/configs/debian-dri - -CONFIG_NAME = debian-dri-powerpc - -DRI_DIRS = mach64 r128 r200 r300 radeon tdfx diff --git a/configs/debian-glide b/configs/debian-glide deleted file mode 100644 index 9a7f43b64bd..00000000000 --- a/configs/debian-glide +++ /dev/null @@ -1,7 +0,0 @@ -include $(TOP)/configs/debian - -CONFIG_NAME = debian-glide - -DEBIAN_COMMON_CPPFLAGS += -DFX -I/usr/include/glide3 - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3x -lm -lpthread diff --git a/configs/debian-glide_i386 b/configs/debian-glide_i386 deleted file mode 100644 index dd0ab727a63..00000000000 --- a/configs/debian-glide_i386 +++ /dev/null @@ -1,7 +0,0 @@ -include $(TOP)/configs/debian-i386 - -CONFIG_NAME = debian-glide-i386 - -DEBIAN_COMMON_CPPFLAGS += -DFX -I/usr/include/glide3 - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3x -lm -lpthread diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16 deleted file mode 100644 index 5176a82ce1f..00000000000 --- a/configs/debian-osmesa16 +++ /dev/null @@ -1,15 +0,0 @@ -include $(TOP)/configs/debian - -CONFIG_NAME = debian-osmesa16 - -DEBIAN_COMMON_CPPFLAGS += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 - -OSMESA_LIB = OSMesa16 -OSMESA_LIB_NAME = libOSMesa16.so - -SRC_DIRS = mesa glu -DRIVER_DIRS = osmesa -PROGRAM_DIRS = - -OSMESA_LIB_DEPS = -lm -lpthread -APP_LIB_DEPS = -lOSMesa16 diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static deleted file mode 100644 index 7ec23fb9eaf..00000000000 --- a/configs/debian-osmesa16-static +++ /dev/null @@ -1,14 +0,0 @@ -include $(TOP)/configs/debian-static - -CONFIG_NAME = debian-osmesa16-static - -DEBIAN_COMMON_CPPFLAGS += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 - -OSMESA_LIB = OSMesa16 -OSMESA_LIB_NAME = libOSMesa16.a - -SRC_DIRS = mesa glu -DRIVER_DIRS = osmesa -PROGRAM_DIRS = - -APP_LIB_DEPS = -lOSMesa16 diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32 deleted file mode 100644 index 775cc7986f4..00000000000 --- a/configs/debian-osmesa32 +++ /dev/null @@ -1,15 +0,0 @@ -include $(TOP)/configs/debian - -CONFIG_NAME = debian-osmesa32 - -DEBIAN_COMMON_CPPFLAGS += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 - -OSMESA_LIB = OSMesa32 -OSMESA_LIB_NAME = libOSMesa32.so - -SRC_DIRS = mesa glu -DRIVER_DIRS = osmesa -PROGRAM_DIRS = - -OSMESA_LIB_DEPS = -lm -lpthread -APP_LIB_DEPS = -lOSMesa32 diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static deleted file mode 100644 index cea7a2b9a98..00000000000 --- a/configs/debian-osmesa32-static +++ /dev/null @@ -1,14 +0,0 @@ -include $(TOP)/configs/debian-static - -CONFIG_NAME = debian-osmesa32-static - -DEBIAN_COMMON_CPPFLAGS += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 - -OSMESA_LIB = OSMesa32 -OSMESA_LIB_NAME = libOSMesa32.a - -SRC_DIRS = mesa glu -DRIVER_DIRS = osmesa -PROGRAM_DIRS = - -APP_LIB_DEPS = -lOSMesa32 diff --git a/configs/debian-static b/configs/debian-static deleted file mode 100644 index bc300d5b7e1..00000000000 --- a/configs/debian-static +++ /dev/null @@ -1,33 +0,0 @@ -include $(TOP)/configs/default - -CONFIG_NAME = debian-static - -CC = cc -CXX = c++ - -DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include - -DEBIAN_COMMON_CFLAGS = -ansi -pedantic -Wall - -DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall - -DEBIAN_OPT_CFLAGS = -O2 - -CFLAGS = $(DEBIAN_COMMON_CPPFLAGS) $(DEBIAN_COMMON_CFLAGS) $(DEBIAN_OPT_CFLAGS) -CXXFLAGS = $(DEBIAN_COMMON_CPPFLAGS) $(DEBIAN_COMMON_CXXFLAGS) $(DEBIAN_OPT_CFLAGS) - -GLW_SOURCES += GLwMDrawA.c - -MKLIB_OPTIONS = -static - -GL_LIB_NAME = libGL.a -GLU_LIB_NAME = libGLU.a -GLW_LIB_NAME = libGLw.a -OSMESA_LIB_NAME = libOSMesa.a - -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -GLW_LIB_DEPS = -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++ - diff --git a/configs/debian-static_i386 b/configs/debian-static_i386 deleted file mode 100644 index 4f1ae52f944..00000000000 --- a/configs/debian-static_i386 +++ /dev/null @@ -1,7 +0,0 @@ -include $(TOP)/configs/debian-static - -CONFIG_NAME = debian-static-i386 - -DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM - -ASM_SOURCES = $(X86_SOURCES) $(X86_API) diff --git a/configs/debian_i386 b/configs/debian_i386 deleted file mode 100644 index 2865617a520..00000000000 --- a/configs/debian_i386 +++ /dev/null @@ -1,7 +0,0 @@ -include $(TOP)/configs/debian - -CONFIG_NAME = debian-i386 - -DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=387 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM - -ASM_SOURCES = $(X86_SOURCES) $(X86_API) diff --git a/configs/default b/configs/default deleted file mode 100644 index e3b1bc0ecb5..00000000000 --- a/configs/default +++ /dev/null @@ -1,74 +0,0 @@ -# Default/template configuration - -# This is included by other config files which may override some -# of these variables. - -CONFIG_NAME = default - -# Version info -MESA_MAJOR=6 -MESA_MINOR=4 -MESA_TINY=1 - -# external projects. This should be useless now that we use libdrm. -DRM_SOURCE_PATH=$(TOP)/../drm - -# Compiler and flags -CC = cc -CXX = CC -CFLAGS = -O -CXXFLAGS = -O -GLU_CFLAGS = - -# Misc tools and flags -MKLIB_OPTIONS = -MKDEP = makedepend -MKDEP_OPTIONS = -fdepend -MAKE = make - -# Python and flags (generally only needed by the developers) -PYTHON2 = python -PYTHON_FLAGS = -t -O -O - -# Library names (base name) -GL_LIB = GL -GLU_LIB = GLU -GLUT_LIB = glut -GLW_LIB = GLw -OSMESA_LIB = OSMesa - - -# 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 - - -# Optional assembly language optimization files for libGL -ASM_SOURCES = - -# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in -# order to build the Motif widget too) -GLW_SOURCES = GLwDrawA.c - - -# Directories -LIB_DIR = $(TOP)/lib -INSTALL_PREFIX = /usr/local -SRC_DIRS = mesa glu glut/glx glw -GLU_DIRS = sgi -DRIVER_DIRS = x11 osmesa -# Which subdirs under $(TOP)/progs/ to enter: -PROGRAM_DIRS = demos redbook samples xdemos - - -# Library/program dependencies -EXTRA_LIB_PATH ?= -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/configs/freebsd b/configs/freebsd deleted file mode 100644 index 910352abd3e..00000000000 --- a/configs/freebsd +++ /dev/null @@ -1,16 +0,0 @@ -# Configuration for FreeBSD - -include $(TOP)/configs/default - -CONFIG_NAME = FreeBSD - -# Compiler and flags -CC = gcc -CXX = g++ -MAKE = gmake - -CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 -CXXFLAGS = -O2 -fPIC -pedantic -GLUT_CFLAGS = -fexceptions - -APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm diff --git a/configs/freebsd-dri b/configs/freebsd-dri deleted file mode 100644 index fd07dbefe5c..00000000000 --- a/configs/freebsd-dri +++ /dev/null @@ -1,45 +0,0 @@ -# -*-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 - -EXPAT_INCLUDES = -I/usr/local/include -X11_INCLUDES = -I/usr/X11R6/include -DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ - -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \ - -ffast-math $(X11_INCLUDES) -CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC - -ASM_SOURCES = - -# Library/program dependencies -LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm -DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB) -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB) - -GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 - - -# Directories -SRC_DIRS = glx/x11 mesa glu glut/glx glw -DRIVER_DIRS = dri -PROGRAM_DIRS = -WINDOW_SYSTEM=dri - -DRM_SOURCE_PATH=$(TOP)/../drm - -# ffb and gamma are missing because they have not been converted to use the new -# interface. -DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 r300 radeon tdfx \ - unichrome savage sis - diff --git a/configs/freebsd-dri-amd64 b/configs/freebsd-dri-amd64 deleted file mode 100644 index ffddfd83542..00000000000 --- a/configs/freebsd-dri-amd64 +++ /dev/null @@ -1,9 +0,0 @@ -# -*-makefile-*- -# Configuration for freebsd-dri-amd64: FreeBSD DRI hardware drivers - -include $(TOP)/configs/freebsd-dri - -CONFIG_NAME = freebsd-dri-x86-64 - -ASM_FLAGS = -DUSE_X86_64_ASM -ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API) diff --git a/configs/freebsd-dri-x86 b/configs/freebsd-dri-x86 deleted file mode 100644 index 31316b1f7a5..00000000000 --- a/configs/freebsd-dri-x86 +++ /dev/null @@ -1,12 +0,0 @@ -# -*-makefile-*- -# Configuration for freebsd-dri: FreeBSD DRI hardware drivers - -include $(TOP)/configs/freebsd-dri - -CONFIG_NAME = freebsd-dri-x86 - -# Unnecessary on x86, generally. -PIC_FLAGS = - -ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -ASM_SOURCES = $(X86_SOURCES) diff --git a/configs/hpux10 b/configs/hpux10 deleted file mode 100644 index e17c8b68134..00000000000 --- a/configs/hpux10 +++ /dev/null @@ -1,14 +0,0 @@ -# Configuration for HPUX v10, shared libs - -include $(TOP)/configs/default - -CONFIG_NAME = hpux10 - -# Compiler and flags -CC = cc -CXX = aCC - -CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE - -APP_LIB_DEPS = -$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm diff --git a/configs/hpux10-gcc b/configs/hpux10-gcc deleted file mode 100644 index 107a99a85c2..00000000000 --- a/configs/hpux10-gcc +++ /dev/null @@ -1,16 +0,0 @@ -# Configuration for HPUX v10, with gcc - -include $(TOP)/configs/default - -CONFIG_NAME = hpux10-gcc - -# Compiler and flags -CC = gcc -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 - -APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm - diff --git a/configs/hpux10-static b/configs/hpux10-static deleted file mode 100644 index 38a1313e697..00000000000 --- a/configs/hpux10-static +++ /dev/null @@ -1,30 +0,0 @@ -# Configuration for HPUX v10, static libs - -include $(TOP)/configs/default - -CONFIG_NAME = hpux10-static - -# Compiler and flags -CC = cc -CXX = aCC - -CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE - -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 - -# Library/program dependencies (static libs don't have dependencies) -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -GLUT_LIB_DEPS = -GLW_LIB_DEPS = -APP_LIB_DEPS = -L$(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$(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/configs/hpux11-32 b/configs/hpux11-32 deleted file mode 100644 index 9ff407bd53e..00000000000 --- a/configs/hpux11-32 +++ /dev/null @@ -1,26 +0,0 @@ -# Configuration for HPUX v11 - -include $(TOP)/configs/default - -CONFIG_NAME = hpux11-32 - -# Compiler and flags -CC = cc -CXX = aCC - -CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS - -CXXFLAGS = +z -Aa +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include - -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 - -# Library/program dependencies -APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm diff --git a/configs/hpux11-32-static b/configs/hpux11-32-static deleted file mode 100644 index 7507ab0b0b5..00000000000 --- a/configs/hpux11-32-static +++ /dev/null @@ -1,26 +0,0 @@ -# Configuration for HPUX v11, static libs - -include $(TOP)/configs/default - -CONFIG_NAME = hpux11-32-static - -# Compiler and flags -CC = cc -CXX = aCC - -CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS - -CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include - -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 - -# Library/program dependencies -APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm diff --git a/configs/hpux11-32-static-nothreads b/configs/hpux11-32-static-nothreads deleted file mode 100644 index 91b365408c9..00000000000 --- a/configs/hpux11-32-static-nothreads +++ /dev/null @@ -1,26 +0,0 @@ -# Configuration for HPUX v11, static libs - -include $(TOP)/configs/default - -CONFIG_NAME = hpux11-32-static - -# Compiler and flags -CC = cc -CXX = aCC - -CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM - -CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include - -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 - -# Library/program dependencies -APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm diff --git a/configs/hpux11-64 b/configs/hpux11-64 deleted file mode 100644 index b0869cf81df..00000000000 --- a/configs/hpux11-64 +++ /dev/null @@ -1,27 +0,0 @@ -# Configuration for HPUX v11, 64-bit - -include $(TOP)/configs/default - -CONFIG_NAME = hpux11-64 - -# Compiler and flags -CC = cc -CXX = aCC - -CFLAGS = +z -Ae +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS - -CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include - -MKLIB_OPTIONS = - -LIBDIR = $(TOP)/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 - -# Library/program dependencies -APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm diff --git a/configs/hpux11-64-static b/configs/hpux11-64-static deleted file mode 100644 index 451dc4208e4..00000000000 --- a/configs/hpux11-64-static +++ /dev/null @@ -1,27 +0,0 @@ -# Configuration for HPUX v11, 64-bit, static libs - -include $(TOP)/configs/default - -CONFIG_NAME = hpux11-64-static - -# Compiler and flags -CC = cc -CXX = aCC - -CFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS - -CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include - -MKLIB_OPTIONS = -static - -LIBDIR = $(TOP)/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 - -# Library/program dependencies -APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm diff --git a/configs/hpux9 b/configs/hpux9 deleted file mode 100644 index 03738175761..00000000000 --- a/configs/hpux9 +++ /dev/null @@ -1,16 +0,0 @@ -# Configuration for HPUX v9, shared libs - -include $(TOP)/configs/default - -CONFIG_NAME = hpux9 - -# Compiler and flags -CC = cc -# XXX fix this -CXX = c++ - -CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM -CXXFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 - -APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm - diff --git a/configs/hpux9-gcc b/configs/hpux9-gcc deleted file mode 100644 index 47d579ea567..00000000000 --- a/configs/hpux9-gcc +++ /dev/null @@ -1,14 +0,0 @@ -# Configuration for HPUX v10, shared libs - -include $(TOP)/configs/default - -CONFIG_NAME = hpux9-gcc - -# Compiler and flags -CC = cc -CXX = aCC - -CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE - -APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm diff --git a/configs/irix6-64 b/configs/irix6-64 deleted file mode 100644 index 6c33d33ba92..00000000000 --- a/configs/irix6-64 +++ /dev/null @@ -1,18 +0,0 @@ -# Configuration for IRIX 6.x, make n64 DSOs - -include $(TOP)/configs/default - -CONFIG_NAME = irix6-64 - -# Compiler and flags -CC = cc -CXX = CC -CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -CXXFLAGS = -64 -O3 -ansi -woff 1174 -MKLIB_OPTIONS = -archopt 64 - -GLW_SOURCES = GLwDrawA.c GLwMDrawA.c - -LIB_DIR = $(TOP)/lib64 - -APP_LIB_DEPS = -L$(LIB_DIR) -64 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm diff --git a/configs/irix6-64-static b/configs/irix6-64-static deleted file mode 100644 index d66af5be878..00000000000 --- a/configs/irix6-64-static +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration for IRIX 6.x, make n64 static libs - -include $(TOP)/configs/default - -CONFIG_NAME = irix6-64-static - -# Compiler and flags -CC = cc -CXX = CC -CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -CXXFLAGS = -64 -O3 -ansi -woff 1174 -MKLIB_OPTIONS = -archopt 64 -static - -GLW_SOURCES = GLwDrawA.c GLwMDrawA.c - -LIB_DIR = $(TOP)/lib64 - -APP_LIB_DEPS = -L$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm - -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/configs/irix6-n32 b/configs/irix6-n32 deleted file mode 100644 index 4bf2964014f..00000000000 --- a/configs/irix6-n32 +++ /dev/null @@ -1,18 +0,0 @@ -# Configuration for IRIX 6.x, make n32 DSOs - -include $(TOP)/configs/default - -CONFIG_NAME = irix6-n32 - -# Compiler and flags -CC = cc -CXX = CC -CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -MKLIB_OPTIONS = -archopt n32 - -GLW_SOURCES = GLwDrawA.c GLwMDrawA.c - -LIB_DIR = $(TOP)/lib32 - -APP_LIB_DEPS = -L$(LIB_DIR) -n32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lm diff --git a/configs/irix6-n32-static b/configs/irix6-n32-static deleted file mode 100644 index b60de380c62..00000000000 --- a/configs/irix6-n32-static +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration for IRIX 6.x, make n32 static libs - -include $(TOP)/configs/default - -CONFIG_NAME = irix6-n32-static - -# Compiler and flags -CC = cc -CXX = CC -CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 -MKLIB_OPTIONS = -archopt n32 -static - -GLW_SOURCES = GLwDrawA.c GLwMDrawA.c - -LIB_DIR = $(TOP)/lib32 - -APP_LIB_DEPS = -L$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm - -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/configs/irix6-o32 b/configs/irix6-o32 deleted file mode 100644 index 56a19796031..00000000000 --- a/configs/irix6-o32 +++ /dev/null @@ -1,19 +0,0 @@ -# Configuration for IRIX 6.x, make o32 DSOs - -include $(TOP)/configs/default - -CONFIG_NAME = irix6-o32 - -# Compiler and flags -CC = cc -CXX = CC -CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666 -MKLIB_OPTIONS = -archopt o32 - -GLW_SOURCES = GLwDrawA.c GLwMDrawA.c - -LIB_DIR = $(TOP)/lib32 - -APP_LIB_DEPS = -L$(LIB_DIR) -32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm - diff --git a/configs/irix6-o32-static b/configs/irix6-o32-static deleted file mode 100644 index ac3d6ee17a6..00000000000 --- a/configs/irix6-o32-static +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration for IRIX 6.x, make o32 static libs - -include $(TOP)/configs/default - -CONFIG_NAME = irix6-o32-static - -# Compiler and flags -CC = cc -CXX = CC -CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666 -MKLIB_OPTIONS = -archopt o32 -static - -GLW_SOURCES = GLwDrawA.c GLwMDrawA.c - -LIB_DIR = $(TOP)/lib32 - -APP_LIB_DEPS = -L$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm - -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/configs/linux b/configs/linux deleted file mode 100644 index e3119ec5cdb..00000000000 --- a/configs/linux +++ /dev/null @@ -1,33 +0,0 @@ -# Configuration for generic Linux - -include $(TOP)/configs/default - -CONFIG_NAME = linux - -# Compiler and flags -CC = gcc -CXX = g++ - -WARN_FLAGS = -Wall -OPT_FLAGS = -O3 -g -PIC_FLAGS = -fPIC - -# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32 -# to build properly on 64-bit platforms. - -ARCH_FLAGS ?= - -DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ - -D_BSD_SOURCE -DPTHREADS -DUSE_XSHM - -X11_INCLUDES = -I/usr/X11R6/include - -CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ - $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math - -CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ - $(X11_INCLUDES) - -GLUT_CFLAGS = -fexceptions - -EXTRA_LIB_PATH = -L/usr/X11R6/lib diff --git a/configs/linux-alpha b/configs/linux-alpha deleted file mode 100644 index 507c8084518..00000000000 --- a/configs/linux-alpha +++ /dev/null @@ -1,18 +0,0 @@ -# Configuration for Linux on Alpha - -include $(TOP)/configs/default - -CONFIG_NAME = linux-alpha - -# Compiler and flags -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 - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm - diff --git a/configs/linux-alpha-static b/configs/linux-alpha-static deleted file mode 100644 index 7b7ee07ebbd..00000000000 --- a/configs/linux-alpha-static +++ /dev/null @@ -1,27 +0,0 @@ -# Configuration for Linux on Alpha, static libs - -include $(TOP)/configs/default - -CONFIG_NAME = linux-alpha-static - -# Compiler and flags -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 - - -# 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$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm diff --git a/configs/linux-debug b/configs/linux-debug deleted file mode 100644 index ff4d1c33b5f..00000000000 --- a/configs/linux-debug +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration for debugging on Linux - -include $(TOP)/configs/linux - -CONFIG_NAME = linux-debug - -OPT_FLAGS = -g -DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK diff --git a/configs/linux-directfb b/configs/linux-directfb deleted file mode 100644 index f09c69ddabd..00000000000 --- a/configs/linux-directfb +++ /dev/null @@ -1,29 +0,0 @@ -# Configuration for DirectFB - -include $(TOP)/configs/default - -CONFIG_NAME = linux-directfb - -# Compiler and flags -CC = gcc -CXX = g++ - -CFLAGS = -Wall -O3 -ffast-math -fPIC -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE -D_SVID_SOURCE \ - -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DPTHREADS - -CXXFLAGS = -Wall -O3 -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE - -HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes) -ifeq ($(HAVE_X86), yes) - CFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM - CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM - ASM_SOURCES = $(X86_SOURCES) $(X86_API) -endif - -# Directories -SRC_DIRS = mesa glu -DRIVER_DIRS = directfb -PROGRAM_DIRS = # disabled - -# Library/program dependencies -GL_LIB_DEPS = -lm -lpthread diff --git a/configs/linux-dri b/configs/linux-dri deleted file mode 100644 index 293f2e789d5..00000000000 --- a/configs/linux-dri +++ /dev/null @@ -1,68 +0,0 @@ -# -*-makefile-*- -# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others - -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 \ - -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ - -DGLX_DIRECT_RENDERING -DHAVE_ALIAS - -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) - - -ASM_SOURCES = - -# Library/program dependencies -EXTRA_LIB_PATH=-L/usr/X11R6/lib - -LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm -DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ - $(LIBDRM_LIB) - - -# This is now 0 by default since it seems to confuse the hell out of people -# and generate a lot of extra noise on bugzilla. If you need to build with -# EGL, do 'make linux-dri USING_EGL=1' - -USING_EGL=0 - -# Directories -ifeq ($(USING_EGL), 1) -SRC_DIRS = egl glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = egl -else -SRC_DIRS = glx/x11 mesa glu glut/glx glw -PROGRAM_DIRS = -endif - -DRIVER_DIRS = dri -WINDOW_SYSTEM=dri - -# gamma are missing because they have not been converted to use the new -# interface. -DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v \ - savage sis tdfx trident unichrome ffb diff --git a/configs/linux-dri-ppc b/configs/linux-dri-ppc deleted file mode 100644 index fb87688065f..00000000000 --- a/configs/linux-dri-ppc +++ /dev/null @@ -1,17 +0,0 @@ -# -*-makefile-*- -# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others - -include $(TOP)/configs/linux-dri - -CONFIG_NAME = linux-dri-ppc - -OPT_FLAGS = -Os -mcpu=603 -PIC_FLAGS = -fPIC - -ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM -ASM_SOURCES = $(PPC_SOURCES) - -# Build only the drivers for cards that exist on PowerPC. At some point MGA -# will be added, but not yet. -DRI_DIRS = mach64 r128 r200 r300 radeon tdfx - diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86 deleted file mode 100644 index bef24e059e7..00000000000 --- a/configs/linux-dri-x86 +++ /dev/null @@ -1,16 +0,0 @@ -# -*-makefile-*- -# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others - -include $(TOP)/configs/linux-dri - -CONFIG_NAME = linux-dri-x86 - -# Unnecessary on x86, generally. -PIC_FLAGS = - -# Add -m32 to CFLAGS: -ARCH_FLAGS = -m32 - -ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -ASM_SOURCES = $(X86_SOURCES) - diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 deleted file mode 100644 index affbe2bc612..00000000000 --- a/configs/linux-dri-x86-64 +++ /dev/null @@ -1,23 +0,0 @@ -# -*-makefile-*- -# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others - -include $(TOP)/configs/linux-dri - -CONFIG_NAME = linux-dri-x86-64 - -ARCH_FLAGS = -m64 - -ASM_FLAGS = -DUSE_X86_64_ASM -ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API) - -LIB_DIR = $(TOP)/lib64 - -# Library/program dependencies -EXTRA_LIB_PATH=-L/usr/X11R6/lib64 - -# ffb, gamma, and sis are missing because they have not be converted to use -# the new interface. i810 and i830 are missing because there is no x86-64 -# system where they could *ever* be used. -# -DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300 - diff --git a/configs/linux-fbdev b/configs/linux-fbdev deleted file mode 100644 index c357485ea16..00000000000 --- a/configs/linux-fbdev +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for Linux fbdev interface - -include $(TOP)/configs/linux - -CONFIG_NAME = linux-fbdev -DRIVER_DIRS = fbdev - -CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DUSE_GLFBDEV_DRIVER - -PROGRAM_DIRS = fbdev diff --git a/configs/linux-glide b/configs/linux-glide deleted file mode 100644 index d3e0dc32d53..00000000000 --- a/configs/linux-glide +++ /dev/null @@ -1,20 +0,0 @@ -# Configuration for generic Linux with 3Dfx Glide driver - -include $(TOP)/configs/default - -CONFIG_NAME = linux-glide - -# 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 -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include -CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -GLUT_CFLAGS = -fexceptions - - -# Library/program dependencies -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm diff --git a/configs/linux-icc b/configs/linux-icc deleted file mode 100644 index 0da3b836a7f..00000000000 --- a/configs/linux-icc +++ /dev/null @@ -1,21 +0,0 @@ -# Configuration for Linux with Intel C compiler - -include $(TOP)/configs/default - -CONFIG_NAME = linux-icc - -# Compiler and flags -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$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm - -ASM_SOURCES = $(X86_SOURCES) $(X86_API) - - diff --git a/configs/linux-icc-static b/configs/linux-icc-static deleted file mode 100644 index 5c65f056185..00000000000 --- a/configs/linux-icc-static +++ /dev/null @@ -1,29 +0,0 @@ -# Configuration for Linux with Intel C compiler, static libs - -include $(TOP)/configs/default - -CONFIG_NAME = linux-icc-static - -# Compiler and flags -CC = icc -CXX = g++ -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 -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 = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -MKLIB_OPTIONS = -arch icc - -ASM_SOURCES = $(X86_SOURCES) $(X86_API) - - diff --git a/configs/linux-indirect b/configs/linux-indirect deleted file mode 100644 index 93166e2e98d..00000000000 --- a/configs/linux-indirect +++ /dev/null @@ -1,49 +0,0 @@ -# -*-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 \ - -DPTHREADS -DHAVE_ALIAS - -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) - - -ASM_SOURCES = - -# Library/program dependencies -EXTRA_LIB_PATH=-L/usr/X11R6/lib - -DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl - - -# Directories -SRC_DIRS = glx/x11 glu glut/glx glw -DRIVER_DIRS = -PROGRAM_DIRS = -WINDOW_SYSTEM=dri diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16 deleted file mode 100644 index 16a3b0bbae9..00000000000 --- a/configs/linux-osmesa16 +++ /dev/null @@ -1,27 +0,0 @@ -# Configuration for 16 bits/channel OSMesa library on Linux - -include $(TOP)/configs/default - -CONFIG_NAME = linux-osmesa16 - -# 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 -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 -CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE - - -# Library names -OSMESA_LIB = OSMesa16 -OSMESA_LIB_NAME = libOSMesa16.so - - -# Directories -SRC_DIRS = mesa glu -DRIVER_DIRS = osmesa -PROGRAM_DIRS = - - -# Dependencies -OSMESA_LIB_DEPS = -lm -lpthread -APP_LIB_DEPS = -lOSMesa16 diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static deleted file mode 100644 index 6645504478e..00000000000 --- a/configs/linux-osmesa16-static +++ /dev/null @@ -1,28 +0,0 @@ -# Configuration for 16 bits/channel OSMesa library on Linux - -include $(TOP)/configs/default - -CONFIG_NAME = linux-osmesa16-static - -# Compiler and flags -CC = gcc -CXX = g++ -CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 -CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -MKLIB_OPTIONS = -static - - -# Library names -OSMESA_LIB = OSMesa16 -OSMESA_LIB_NAME = libOSMesa16.a - - -# Directories -SRC_DIRS = mesa glu -DRIVER_DIRS = osmesa -PROGRAM_DIRS = - - -# Dependencies -OSMESA_LIB_DEPS = -lm -lpthread -APP_LIB_DEPS = -lOSMesa16 diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32 deleted file mode 100644 index 0ff0a6db9b3..00000000000 --- a/configs/linux-osmesa32 +++ /dev/null @@ -1,27 +0,0 @@ -# Configuration for 32 bits/channel OSMesa library on Linux - -include $(TOP)/configs/default - -CONFIG_NAME = linux-osmesa32 - -# 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 -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 -CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE - - -# Library names -OSMESA_LIB = OSMesa32 -OSMESA_LIB_NAME = libOSMesa32.so - - -# Directories -SRC_DIRS = mesa glu -DRIVER_DIRS = osmesa -PROGRAM_DIRS = - - -# Dependencies -OSMESA_LIB_DEPS = -lm -lpthread -APP_LIB_DEPS = -lOSMesa32 diff --git a/configs/linux-ppc b/configs/linux-ppc deleted file mode 100644 index 13cfdeb422b..00000000000 --- a/configs/linux-ppc +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for Linux on PPC - -include $(TOP)/configs/linux - -CONFIG_NAME = linux-ppc - -OPT_FLAGS = -O3 -mcpu=603 -fsigned-char -funroll-loops - -# FIXME: Use of PowerPC assembly should be enabled here.
\ No newline at end of file diff --git a/configs/linux-ppc-static b/configs/linux-ppc-static deleted file mode 100644 index d0e168811f8..00000000000 --- a/configs/linux-ppc-static +++ /dev/null @@ -1,14 +0,0 @@ -# Configuration for Linux on PPC, static libs - -include $(TOP)/configs/linux-ppc - -CONFIG_NAME = linux-ppc-static - -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/configs/linux-profile b/configs/linux-profile deleted file mode 100644 index b2531f5628a..00000000000 --- a/configs/linux-profile +++ /dev/null @@ -1,29 +0,0 @@ -# Configuration for profiling on Linux with gprof - -include $(TOP)/configs/default - -CONFIG_NAME = linux-profile - -# Compiler and flags -CC = gcc -CXX = g++ - -CFLAGS = -pg -O -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG - -CXXFLAGS = -pg -O -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG - -GLUT_CFLAGS = -fexceptions - -# Need to have -L/usr/X11R6/lib in these: -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11 - -# Need to make static libs for profiling: -MKLIB_OPTIONS = -static -GL_LIB_NAME = lib$(GL_LIB).a -GLU_LIB_NAME = lib$(GLU_LIB).a -GLUT_LIB_NAME = lib$(GLUT_LIB).a -GLW_LIB_NAME = lib$(GLW_LIB).a -OSMESA_LIB_NAME = lib$(OSMesa).a -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread diff --git a/configs/linux-solo b/configs/linux-solo deleted file mode 100644 index a3deb7c200e..00000000000 --- a/configs/linux-solo +++ /dev/null @@ -1,43 +0,0 @@ -# Configuration for linux-solo: Linux DRI hardware drivers for fbdev - -include $(TOP)/configs/default - -CONFIG_NAME = linux-solo - -# Compiler and flags -CC = gcc -CXX = g++ - -WARN_FLAGS = -Wall -Wundef -OPT_FLAGS = -O3 -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 -DDRM_USE_MALLOC -DIN_DRI_DRIVER - -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) - - -ASM_SOURCES = - -# Library/program dependencies -DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(LIB_DIR) -GL_LIB_DEPS = -lm -lpthread -ldl -GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread - -# Directories -SRC_DIRS = glx/mini mesa glu glut/mini -DRIVER_DIRS = dri -PROGRAM_DIRS = miniglx - -#DRI_DIRS = ffb gamma sis savage -DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome fb diff --git a/configs/linux-solo-ia64 b/configs/linux-solo-ia64 deleted file mode 100644 index b2051fac855..00000000000 --- a/configs/linux-solo-ia64 +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration for linux-solo-ia64: Linux DRI hardware drivers for fbdev - -include $(TOP)/configs/linux-solo - -CONFIG_NAME = linux-solo-ia64 - -DRI_DIRS = fb mach64 mga r128 r200 radeon sis tdfx unichrome diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86 deleted file mode 100644 index b4e79ba2c09..00000000000 --- a/configs/linux-solo-x86 +++ /dev/null @@ -1,12 +0,0 @@ -# -*-makefile-*- -# Configuration for linux-solo-x86: Linux hardware drivers for fbdev for x86 - -include $(TOP)/configs/linux-solo - -CONFIG_NAME = linux-solo-x86 - -# Unnecessary on x86, generally. -PIC_FLAGS = - -ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -ASM_SOURCES = $(X86_SOURCES) diff --git a/configs/linux-sparc b/configs/linux-sparc deleted file mode 100644 index 15e0b6d4bb4..00000000000 --- a/configs/linux-sparc +++ /dev/null @@ -1,30 +0,0 @@ -# Configuration for Linux on Sparc - -include $(TOP)/configs/default - -CONFIG_NAME = linux-sparc - -# Compiler and flags -CC = gcc -CXX = g++ - -WARN_FLAGS = -Wall -OPT_FLAGS = -O2 -PIC_FLAGS = -fPIC - -DEFINES = -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM - -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) - -GLUT_CFLAGS = -fexceptions - -EXTRA_LIB_PATH=-L/usr/X11R6/lib - -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 diff --git a/configs/linux-sparc5 b/configs/linux-sparc5 deleted file mode 100644 index aa9461af763..00000000000 --- a/configs/linux-sparc5 +++ /dev/null @@ -1,17 +0,0 @@ -# Configuration for Linux on Sparc5 - -include $(TOP)/configs/default - -CONFIG_NAME = linux-sparc5 - -# Compiler and flags -CC = gcc -CXX = g++ -CFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -CXXFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -GLUT_CFLAGS = -fexceptions - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 - diff --git a/configs/linux-static b/configs/linux-static deleted file mode 100644 index 0104d34022b..00000000000 --- a/configs/linux-static +++ /dev/null @@ -1,21 +0,0 @@ -# Configuration for generic Linux, making static libs - -include $(TOP)/configs/linux - -CONFIG_NAME = linux-static - -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 - -# Library/program dependencies (static libs don't have dependencies) -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -GLUT_LIB_DEPS = -GLW_LIB_DEPS = diff --git a/configs/linux-tcc b/configs/linux-tcc deleted file mode 100644 index 4371fe21fc7..00000000000 --- a/configs/linux-tcc +++ /dev/null @@ -1,22 +0,0 @@ -# Configuration for debugging on Linux - -include $(TOP)/configs/default - -CONFIG_NAME = linux-tcc - -# Compiler and flags -CC = gcc -CXX = g++ - -TCC_DIR=/home/progs/tcc-0.9.20 - -CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR) - -CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG - -GLUT_CFLAGS = -fexceptions - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ldl -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/configs/linux-ultrasparc b/configs/linux-ultrasparc deleted file mode 100644 index e235b56defe..00000000000 --- a/configs/linux-ultrasparc +++ /dev/null @@ -1,17 +0,0 @@ -# Configuration for Linux on UltraSparc - -include $(TOP)/configs/default - -CONFIG_NAME = linux-ultrasparc - -# Compiler and flags -CC = gcc -CXX = g++ -CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -CXXFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -GLUT_CFLAGS = -fexceptions - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR)-l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/configs/linux-x86 b/configs/linux-x86 deleted file mode 100644 index b239653e6b9..00000000000 --- a/configs/linux-x86 +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration for Linux with x86 optimizations - -include $(TOP)/configs/linux - -CONFIG_NAME = linux-x86 - -ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -ASM_SOURCES = $(X86_SOURCES) $(X86_API) diff --git a/configs/linux-x86-32 b/configs/linux-x86-32 deleted file mode 100644 index f18ce7a4596..00000000000 --- a/configs/linux-x86-32 +++ /dev/null @@ -1,7 +0,0 @@ -# To build Linux x86 32-bit in an x86-64 environment - -include $(TOP)/configs/linux-x86 - -CONFIG_NAME = linux-x86-32 - -ARCH_FLAGS += -m32 diff --git a/configs/linux-x86-64 b/configs/linux-x86-64 deleted file mode 100644 index f8ff5489f18..00000000000 --- a/configs/linux-x86-64 +++ /dev/null @@ -1,13 +0,0 @@ -# Configuration for Linux for 64-bit X86 (Opteron) - -include $(TOP)/configs/linux - -CONFIG_NAME = linux-x86-64 - -ARCH_FLAGS = -m64 - -ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API) -ASM_FLAGS = -DUSE_X86_64_ASM - -LIB_DIR = $(TOP)/lib64 -EXTRA_LIB_PATH = -L/usr/X11R6/lib64 diff --git a/configs/linux-x86-64-debug b/configs/linux-x86-64-debug deleted file mode 100644 index bbdaec80143..00000000000 --- a/configs/linux-x86-64-debug +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration for Linux for 64-bit X86 (Opteron) - -include $(TOP)/configs/linux-x86-64 - -CONFIG_NAME = linux-x86-64-debug - -DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static deleted file mode 100644 index 05f21d87a64..00000000000 --- a/configs/linux-x86-64-static +++ /dev/null @@ -1,21 +0,0 @@ -# Configuration for Linux for 64-bit X86 (Opteron), static libs - -include $(TOP)/configs/linux-x86-64 - -CONFIG_NAME = linux-x86-64-static - -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 - -# Library/program dependencies (static libs don't have dependencies) -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -GLUT_LIB_DEPS = -GLW_LIB_DEPS = diff --git a/configs/linux-x86-debug b/configs/linux-x86-debug deleted file mode 100644 index dbb970300e4..00000000000 --- a/configs/linux-x86-debug +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for Linux with x86 code, but no gcc optimizations and -# debugging enabled. - -include $(TOP)/configs/linux-x86 - -CONFIG_NAME = linux-x86-debug - -OPT_FLAGS = -g -DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK diff --git a/configs/linux-x86-glide b/configs/linux-x86-glide deleted file mode 100644 index b874b923fff..00000000000 --- a/configs/linux-x86-glide +++ /dev/null @@ -1,24 +0,0 @@ -# Configuration for Linux with 3Dfx Glide driver and x86 optimizations - -include $(TOP)/configs/default - -CONFIG_NAME = linux-x86-glide - -# Compiler and flags -CC = gcc -CXX = g++ - -CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -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 -DFX -I/usr/include/glide -I/usr/local/glide/include - -CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE - -GLUT_CFLAGS = -fexceptions - - -ASM_SOURCES = $(X86_SOURCES) $(X86_API) - -# Library/program dependencies -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm diff --git a/configs/linux-x86-static b/configs/linux-x86-static deleted file mode 100644 index d4ccfca803e..00000000000 --- a/configs/linux-x86-static +++ /dev/null @@ -1,21 +0,0 @@ -# Configuration for Linux with x86 optimizations, static libs - -include $(TOP)/configs/linux-x86 - -CONFIG_NAME = linux-x86-static - -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 - -# Library/program dependencies (static libs don't have dependencies) -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -GLUT_LIB_DEPS = -GLW_LIB_DEPS = diff --git a/configs/linux-x86-xcb b/configs/linux-x86-xcb deleted file mode 100644 index 7c5074c3082..00000000000 --- a/configs/linux-x86-xcb +++ /dev/null @@ -1,24 +0,0 @@ -# Configuration for Linux with x86 optimizations - -include $(TOP)/configs/default - -CONFIG_NAME = linux-x86-xcb - -# Compiler and flags -CC = gcc -CXX = g++ - -CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -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 -DUSE_XCB -I/usr/X11R6/include - -CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XCB - -GLUT_CFLAGS = -fexceptions - - -ASM_SOURCES = $(X86_SOURCES) $(X86_API) - -# Library/program dependencies -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lXCB -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/configs/netbsd b/configs/netbsd deleted file mode 100644 index 104daae0dd6..00000000000 --- a/configs/netbsd +++ /dev/null @@ -1,14 +0,0 @@ -# Configuration for NetBSD - -include $(TOP)/configs/default - -CONFIG_NAME = netbsd - -# Compiler and flags -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$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm - diff --git a/configs/openbsd b/configs/openbsd deleted file mode 100644 index f769259a338..00000000000 --- a/configs/openbsd +++ /dev/null @@ -1,18 +0,0 @@ -# Configuration for OpenBSD - -include $(TOP)/configs/default - -CONFIG_NAME = openbsd - -# Compiler and flags -CC = gcc -CXX = g++ -CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 -CXXFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100 - -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -OSMESA_LIB_DEPS = -lm -GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm -APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm - diff --git a/configs/osf1 b/configs/osf1 deleted file mode 100644 index bc88c204221..00000000000 --- a/configs/osf1 +++ /dev/null @@ -1,16 +0,0 @@ -# Configuration for OSF/1 - -include $(TOP)/configs/default - -CONFIG_NAME = osf1 - -# Compiler and flags -CC = cc -CXX = cxx -CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM -CXXFLAGS = -O2 -std ansi -ieee - -GL_LIB_DEPS = -lX11 -lXext -lm -lpthread -GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm -APP_LIB_DEPS = -L$(LIB_DIR) -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm diff --git a/configs/solaris-x86 b/configs/solaris-x86 deleted file mode 100644 index 7a04417f0c7..00000000000 --- a/configs/solaris-x86 +++ /dev/null @@ -1,18 +0,0 @@ -# Configuration for Solaris on x86 - -include $(TOP)/configs/default - -CONFIG_NAME = solaris-x86 - -# Compiler and flags -CC = cc -CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM -MKLIB_OPTIONS = -static - -APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lglut -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/configs/solaris-x86-gcc b/configs/solaris-x86-gcc deleted file mode 100644 index 01f3d86d1df..00000000000 --- a/configs/solaris-x86-gcc +++ /dev/null @@ -1,24 +0,0 @@ -# Configuration for Solaris on x86 with gcc, static libs - -include $(TOP)/configs/default - -CONFIG_NAME = solaris-x86-gcc - -# Compiler and flags -CC = gcc -CXX = g++ -CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM -CXXFLAGS = -O3 -m486 -fPIC -GLUT_CFLAGS = -fexceptions -MKLIB_OPTIONS = -static - -GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread -GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm -APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm - -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/configs/sunos4 b/configs/sunos4 deleted file mode 100644 index 483b9aa730a..00000000000 --- a/configs/sunos4 +++ /dev/null @@ -1,12 +0,0 @@ -# Configuration for SunOS 4, shared libs - -include $(TOP)/configs/default - -CONFIG_NAME = sunos4 - -# Compiler and flags -CC = acc -CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4 -APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm - - diff --git a/configs/sunos4-gcc b/configs/sunos4-gcc deleted file mode 100644 index 8fb1414fa9a..00000000000 --- a/configs/sunos4-gcc +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration for SunOS 4, with gcc, shared libs - -include $(TOP)/configs/default - -CONFIG_NAME = sunos4-gcc - -# Compiler and flags -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 - -APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm - diff --git a/configs/sunos4-static b/configs/sunos4-static deleted file mode 100644 index 3e510e7514b..00000000000 --- a/configs/sunos4-static +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration for SunOS 4, static libs - -include $(TOP)/configs/default - -CONFIG_NAME = sunos4-static - -# Compiler and flags -CC = acc -CFLAGS = -O -DUSE_XSHM -DSUNOS4 -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 - -# Library/program dependencies (static libs don't have dependencies) -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -GLUT_LIB_DEPS = -GLW_LIB_DEPS = -APP_LIB_DEPS = -L$(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/configs/sunos5 b/configs/sunos5 deleted file mode 100644 index 9347fb842a7..00000000000 --- a/configs/sunos5 +++ /dev/null @@ -1,18 +0,0 @@ -# Configuration for SunOS 5 - -include $(TOP)/configs/default - -CONFIG_NAME = sunos5 - -# Compiler and flags -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$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -lCrun -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/configs/sunos5-gcc b/configs/sunos5-gcc deleted file mode 100644 index 7917c9b004d..00000000000 --- a/configs/sunos5-gcc +++ /dev/null @@ -1,35 +0,0 @@ -# Configuration for SunOS 5, with gcc - -include $(TOP)/configs/default - -CONFIG_NAME = sunos5-gcc - -# Compiler and flags -CC = gcc -CXX = g++ - -WARN_FLAGS = -Wall -OPT_FLAGS = -O3 -g -fomit-frame-pointer -pipe -PIC_FLAGS = -fPIC - -ARCH_FLAGS ?= - -DEFINES = -D_REENTRANT -DUSE_XSHM - -ASM_SOURCES = $(SPARC_SOURCES) $(SPARC_API) -ASM_FLAGS = -DUSE_SPARC_ASM - -CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ - $(ASM_FLAGS) -std=c99 -ffast-math -I/usr/openwin/include - -CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ - -I/usr/openwin/include - -GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG - -# Library/program dependencies -EXTRA_LIB_PATH=-L/usr/openwin/lib - -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXi -lm -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm -APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/configs/sunos5-smp b/configs/sunos5-smp deleted file mode 100644 index 633bced6833..00000000000 --- a/configs/sunos5-smp +++ /dev/null @@ -1,19 +0,0 @@ -# Configuration for SunOS 5, SMP systems - -include $(TOP)/configs/default - -CONFIG_NAME = sunos5-smp - -# Compiler and flags -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$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lCrun - diff --git a/configs/ultrix-gcc b/configs/ultrix-gcc deleted file mode 100644 index c65e275825e..00000000000 --- a/configs/ultrix-gcc +++ /dev/null @@ -1,21 +0,0 @@ -# Configuration for Ultrix, with gcc - -include $(TOP)/configs/default - -CONFIG_NAME = ultrix-gcc - -# Compiler and flags -CC = gcc -CXX = g++ -CFLAGS = -pedantic -O2 -CXXFLAGS = -pedantic -O2 -GLUT_CFLAGS = -fexceptions -MKLIB_OPTIONS = -static - -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 - -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXmu -lX11 -lXi -lm |