diff options
Diffstat (limited to 'mesalib/configs')
-rw-r--r-- | mesalib/configs/beos | 102 | ||||
-rw-r--r-- | mesalib/configs/darwin | 1 | ||||
-rw-r--r-- | mesalib/configs/default | 2 | ||||
-rw-r--r-- | mesalib/configs/freebsd-dri | 5 | ||||
-rw-r--r-- | mesalib/configs/linux-cell | 1 | ||||
-rw-r--r-- | mesalib/configs/linux-dri | 3 | ||||
-rw-r--r-- | mesalib/configs/linux-dri-debug | 2 | ||||
-rw-r--r-- | mesalib/configs/linux-dri-ppc | 2 | ||||
-rw-r--r-- | mesalib/configs/linux-dri-x86-64 | 6 | ||||
-rw-r--r-- | mesalib/configs/linux-dri-xcb | 5 | ||||
-rw-r--r-- | mesalib/configs/linux-fbdev | 16 | ||||
-rw-r--r-- | mesalib/configs/linux-indirect | 2 |
12 files changed, 9 insertions, 138 deletions
diff --git a/mesalib/configs/beos b/mesalib/configs/beos deleted file mode 100644 index 91ea6f768..000000000 --- a/mesalib/configs/beos +++ /dev/null @@ -1,102 +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 - - MESA_ASM_SOURCES = $(X86_SOURCES) - GLAPI_ASM_SOURCES = $(X86_API) - - CC = gcc - CXX = g++ - LD = gcc - - CFLAGS = \ - -Wall -Wno-multichar -Wno-ctor-dtor-privacy \ - $(DEFINES) - - CXXFLAGS = $(CFLAGS) - - # Work around aliasing bugs - developers should comment this out - CFLAGS += -fno-strict-aliasing - CXXFLAGS += -fno-strict-aliasing - - 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 = gallium mesa glu -GLU_DIRS = sgi -DRIVER_DIRS = beos - -# Library/program dependencies -GL_LIB_DEPS = -OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -GLU_LIB_DEPS = -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 41e7ba800..83f417ce0 100644 --- a/mesalib/configs/darwin +++ b/mesalib/configs/darwin @@ -50,7 +50,6 @@ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) 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 GLU_DIRS = sgi DRIVER_DIRS = osmesa diff --git a/mesalib/configs/default b/mesalib/configs/default index e839a1e50..078c85e8b 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -105,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 glw + gallium egl gallium/winsys gallium/targets glu GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa diff --git a/mesalib/configs/freebsd-dri b/mesalib/configs/freebsd-dri index fdf4b293a..c4169b81d 100644 --- a/mesalib/configs/freebsd-dri +++ b/mesalib/configs/freebsd-dri @@ -42,11 +42,10 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 # Directories -SRC_DIRS = glx gallium mesa glu glw +SRC_DIRS = glx gallium mesa glu DRIVER_DIRS = dri DRM_SOURCE_PATH=$(TOP)/../drm -DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \ - unichrome savage sis +DRI_DIRS = i915 i965 r200 r300 radeon diff --git a/mesalib/configs/linux-cell b/mesalib/configs/linux-cell index e87e69a80..7f38da971 100644 --- a/mesalib/configs/linux-cell +++ b/mesalib/configs/linux-cell @@ -36,7 +36,6 @@ CFLAGS = $(COMMON_C_CPP_FLAGS) -Wmissing-prototypes -std=c99 CXXFLAGS = $(COMMON_C_CPP_FLAGS) -# Omitting glw here: SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \ gallium gallium/winsys gallium/targets glu diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri index b82481e0f..26c73ccf0 100644 --- a/mesalib/configs/linux-dri +++ b/mesalib/configs/linux-dri @@ -62,8 +62,7 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 GALLIUM_TARGET_DIRS = GALLIUM_STATE_TRACKERS_DIRS = egl -DRI_DIRS = i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon \ - savage sis tdfx unichrome swrast +DRI_DIRS = i915 i965 nouveau r200 r300 r600 radeon swrast INTEL_LIBS = $(shell pkg-config --libs libdrm_intel) INTEL_CFLAGS = $(shell pkg-config --cflags libdrm_intel) diff --git a/mesalib/configs/linux-dri-debug b/mesalib/configs/linux-dri-debug index 0dbf42883..c42654ce3 100644 --- a/mesalib/configs/linux-dri-debug +++ b/mesalib/configs/linux-dri-debug @@ -11,6 +11,4 @@ ARCH_FLAGS = -DDEBUG #DRI_DIRS = i915tex i915 #DRI_DIRS = i965 #DRI_DIRS = radeon r200 r300 -#DRI_DIRS = unichrome sis -#DRI_DIRS = i810 mga r128 tdfx diff --git a/mesalib/configs/linux-dri-ppc b/mesalib/configs/linux-dri-ppc index a3a3ca83c..cc1ab9c4f 100644 --- a/mesalib/configs/linux-dri-ppc +++ b/mesalib/configs/linux-dri-ppc @@ -13,5 +13,5 @@ MESA_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 +DRI_DIRS = r200 r300 radeon diff --git a/mesalib/configs/linux-dri-x86-64 b/mesalib/configs/linux-dri-x86-64 index 656cf6140..84f547812 100644 --- a/mesalib/configs/linux-dri-x86-64 +++ b/mesalib/configs/linux-dri-x86-64 @@ -16,9 +16,5 @@ LIB_DIR = lib64 # Library/program dependencies EXTRA_LIB_PATH=-L/usr/X11R6/lib64 -# sis is missing because it has not been converted to use -# the new interface. i810 are missing because there is no x86-64 -# system where they could *ever* be used. -# -DRI_DIRS = i915 i965 mach64 mga r128 r200 r300 radeon savage tdfx unichrome +DRI_DIRS = i915 i965 r200 r300 radeon diff --git a/mesalib/configs/linux-dri-xcb b/mesalib/configs/linux-dri-xcb index 021aa3e8b..a845f71d2 100644 --- a/mesalib/configs/linux-dri-xcb +++ b/mesalib/configs/linux-dri-xcb @@ -49,8 +49,7 @@ DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(L 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 +SRC_DIRS = glx gallium mesa glu DRIVER_DIRS = dri -DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \ - savage sis tdfx unichrome +DRI_DIRS = i915 r200 r300 radeon diff --git a/mesalib/configs/linux-fbdev b/mesalib/configs/linux-fbdev deleted file mode 100644 index 45b482a91..000000000 --- a/mesalib/configs/linux-fbdev +++ /dev/null @@ -1,16 +0,0 @@ -# Configuration for Linux fbdev interface - -include $(TOP)/configs/linux - -CONFIG_NAME = linux-fbdev - -CFLAGS += -DUSE_GLFBDEV_DRIVER - -# Work around aliasing bugs - developers should comment this out -CFLAGS += -fno-strict-aliasing - -DRIVER_DIRS = fbdev osmesa - -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -OSMESA_LIB_DEPS = -lm -lpthread - diff --git a/mesalib/configs/linux-indirect b/mesalib/configs/linux-indirect index 82868c4a1..5592a8f29 100644 --- a/mesalib/configs/linux-indirect +++ b/mesalib/configs/linux-indirect @@ -48,5 +48,5 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl # Directories -SRC_DIRS = glx glu glw +SRC_DIRS = glx glu DRIVER_DIRS = |