X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configs%2Fdefault;h=620445f68469021699fecd2270e46ea9f1532e7e;hb=cae5b7f1e34e7ab23937d3ba2ad8a22319e2985a;hp=3eaa74aa07868e41de83b945efa43bb5b9e28186;hpb=883f9891cb203dd087843b830ab058d6c9e160dc;p=mesa.git

diff --git a/configs/default b/configs/default
index 3eaa74aa078..620445f6846 100644
--- a/configs/default
+++ b/configs/default
@@ -8,8 +8,8 @@
 CONFIG_NAME = default
 
 # Version info
-MESA_MAJOR=6
-MESA_MINOR=5
+MESA_MAJOR=7
+MESA_MINOR=1
 MESA_TINY=0
 
 # external projects.  This should be useless now that we use libdrm.
@@ -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,11 +64,11 @@ 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
-EXTRA_LIB_PATH ?=
+#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