diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-02-12 21:09:28 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-02-12 21:09:28 +0000 |
| commit | b597d23cbc3cc1c1361b89e621fcca7ddf9c024a (patch) | |
| tree | 931175127192ecb3f18f61b71ed40d57e5612576 /dist/Mesa/configs/default | |
| parent | 95e90dfb93882027d8e88ed60c6d24fb226511e7 (diff) | |
Update to Mesa 7.0.2. Tested by naddy@ (full ports build), simon@
and oga@ (with dri enabled).
Diffstat (limited to 'dist/Mesa/configs/default')
| -rw-r--r-- | dist/Mesa/configs/default | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/dist/Mesa/configs/default b/dist/Mesa/configs/default index 23d7aedfb..549a18204 100644 --- a/dist/Mesa/configs/default +++ b/dist/Mesa/configs/default @@ -8,9 +8,9 @@ CONFIG_NAME = default # Version info -MESA_MAJOR=6 -MESA_MINOR=5 -MESA_TINY=1 +MESA_MAJOR=7 +MESA_MINOR=0 +MESA_TINY=2 # external projects. This should be useless now that we use libdrm. DRM_SOURCE_PATH=$(TOP)/../drm @@ -20,6 +20,7 @@ CC = cc CXX = CC CFLAGS = -O CXXFLAGS = -O +LDFLAGS = GLU_CFLAGS = # Misc tools and flags @@ -27,8 +28,7 @@ MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend MAKE = make -INSTALL = install -COPY_LIBS = cp -f -d +INSTALL = $(TOP)/bin/minstall # Python and flags (generally only needed by the developers) PYTHON2 = python @@ -64,17 +64,19 @@ 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 +PROGRAM_DIRS = demos redbook samples glsl xdemos -# Library/program dependencies +# Library dependencies #EXTRA_LIB_PATH ?= GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm + +# Program dependencies - specific GL/glut libraries added in Makefiles +APP_LIB_DEPS = -lm |