summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-04-09 19:04:36 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-04-09 19:04:36 -0600
commitf51b76b67080cbc94d932e272bded64b303dbff2 (patch)
treef0c6840aff210bfd85312f3303622dbd6b0867ca
parent40ee989db56cb3938e36c436c7c4b1def7aa2331 (diff)
downloadmesa-f51b76b67080cbc94d932e272bded64b303dbff2.tar.gz
Revert "Hasso Tepper <hasso@estpak.ee>"
This reverts commit 40ee989db56cb3938e36c436c7c4b1def7aa2331.
-rw-r--r--configs/dragonfly38
-rw-r--r--configs/dragonfly-dri56
-rw-r--r--configs/dragonfly-dri-amd6410
-rw-r--r--configs/dragonfly-dri-x8613
4 files changed, 0 insertions, 117 deletions
diff --git a/configs/dragonfly b/configs/dragonfly
deleted file mode 100644
index 97c10e3c90e..00000000000
--- a/configs/dragonfly
+++ /dev/null
@@ -1,38 +0,0 @@
-# Configuration for DragonFly
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = DragonFly
-
-# Compiler and flags
-CC = cc
-CXX = c++
-MAKE = gmake
-
-OPT_FLAGS = -O2
-PIC_FLAGS = -fPIC
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
- -DHZ=100
-
-X11_INCLUDES = -I/usr/pkg/include
-
-CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) \
- -ffast-math -pedantic
-
-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
-CXXFLAGS += -fno-strict-aliasing
-
-EXTRA_LIB_PATH = -L/usr/pkg/lib
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) \
- -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
-
-# Installation directories (for make install)
-INSTALL_DIR = /usr/pkg
-DRI_DRIVER_INSTALL_DIR = /usr/pkg/lib/modules/dri/
-
diff --git a/configs/dragonfly-dri b/configs/dragonfly-dri
deleted file mode 100644
index cb969718042..00000000000
--- a/configs/dragonfly-dri
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*-makefile-*-
-# Configuration for dragonfly-dri: DragonFly DRI hardware drivers
-
-include $(TOP)/configs/dragonfly
-
-CONFIG_NAME = dragonfly-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O -g
-
-EXPAT_INCLUDES = -I/usr/pkg/include
-X11_INCLUDES = -I/usr/pkg/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 =
-
-# Library/program dependencies
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
-LIBDRM_LIB = `pkg-config --libs libdrm`
-DRI_LIB_DEPS = -L/usr/pkg/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/pkg/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
- -lm -lpthread $(LIBDRM_LIB)
-
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGLU -lGL -lX11 -lXmu \
- -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGL -lXt -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 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
- unichrome savage sis
-
diff --git a/configs/dragonfly-dri-amd64 b/configs/dragonfly-dri-amd64
deleted file mode 100644
index 6c812da794d..00000000000
--- a/configs/dragonfly-dri-amd64
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*-makefile-*-
-# Configuration for dragonfly-dri-amd64: DragonFly DRI hardware drivers
-
-include $(TOP)/configs/dragonfly-dri
-
-CONFIG_NAME = dragonfly-dri-x86-64
-
-ASM_FLAGS = -DUSE_X86_64_ASM
-ASM_SOURCES = $(X86-64_SOURCES)
-ASM_API = $(X86-64_API)
diff --git a/configs/dragonfly-dri-x86 b/configs/dragonfly-dri-x86
deleted file mode 100644
index 1fefa80428c..00000000000
--- a/configs/dragonfly-dri-x86
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*-makefile-*-
-# Configuration for dragonfly-dri-x86: DragonFly DRI hardware drivers
-
-include $(TOP)/configs/dragonfly-dri
-
-CONFIG_NAME = dragonfly-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)
-ASM_API = $(X86_API)