diff options
author | Brice Goglin <[email protected]> | 2008-06-10 22:48:43 +0200 |
---|---|---|
committer | Brice Goglin <[email protected]> | 2008-06-10 22:48:43 +0200 |
commit | 2d0ca23319ca1df4a9b099a9d3c13ae4bea9b37b (patch) | |
tree | 49bfd8344bdad21f8783ff76ff4b5906502c7d56 /configs | |
parent | 59c9c40c010ac815668ee4c411003f93aeff857d (diff) | |
parent | 6f4c8b5b5047c6ff6273e3acc98c7ec504bb0e21 (diff) |
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
Diffstat (limited to 'configs')
-rw-r--r-- | configs/dragonfly | 38 | ||||
-rw-r--r-- | configs/dragonfly-dri | 56 | ||||
-rw-r--r-- | configs/dragonfly-dri-amd64 | 10 | ||||
-rw-r--r-- | configs/dragonfly-dri-x86 | 13 | ||||
-rw-r--r-- | configs/freebsd-static | 27 |
5 files changed, 144 insertions, 0 deletions
diff --git a/configs/dragonfly b/configs/dragonfly new file mode 100644 index 00000000000..97c10e3c90e --- /dev/null +++ b/configs/dragonfly @@ -0,0 +1,38 @@ +# 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 new file mode 100644 index 00000000000..cb969718042 --- /dev/null +++ b/configs/dragonfly-dri @@ -0,0 +1,56 @@ +# -*-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 new file mode 100644 index 00000000000..6c812da794d --- /dev/null +++ b/configs/dragonfly-dri-amd64 @@ -0,0 +1,10 @@ +# -*-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 new file mode 100644 index 00000000000..1fefa80428c --- /dev/null +++ b/configs/dragonfly-dri-x86 @@ -0,0 +1,13 @@ +# -*-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) diff --git a/configs/freebsd-static b/configs/freebsd-static new file mode 100644 index 00000000000..f87b1b8e420 --- /dev/null +++ b/configs/freebsd-static @@ -0,0 +1,27 @@ +# Configuration for generic FreeBSD, making static libs +# Written by cy on 2008-04-23. + +include $(TOP)/configs/freebsd + +CONFIG_NAME = freebsd-static + +MKLIB_OPTIONS = -static +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 + +# Library/program dependencies (static libs don't have dependencies) +GL_LIB_DEPS = +OSMESA_LIB_DEPS = +GLU_LIB_DEPS = +GLUT_LIB_DEPS = +GLW_LIB_DEPS = + +# Need to specify all libraries we may need +APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread \ + -lstdc++ -lm |