diff options
author | marha <marha@users.sourceforge.net> | 2010-07-28 18:31:42 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-07-28 18:31:42 +0000 |
commit | 0c0b98ae72397aeed280ffc146b16eb13065f332 (patch) | |
tree | 4a34d9ba1cc396e912aa5b473bc0a5bba968d656 /mesalib/configs/default | |
parent | ddf3c86d1414ac4d95e352b195ac30188f024429 (diff) | |
parent | 022d9c6cf6a67385d84ff33ce095f5c7f9f6d0cc (diff) | |
download | vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.tar.gz vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.tar.bz2 vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/configs/default')
-rw-r--r-- | mesalib/configs/default | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/configs/default b/mesalib/configs/default index 47d6923f0..f12bec8fa 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -10,7 +10,7 @@ CONFIG_NAME = default # Version info MESA_MAJOR=7 MESA_MINOR=8 -MESA_TINY=1 +MESA_TINY=2 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY) # external projects. This should be useless now that we use libdrm. @@ -119,7 +119,7 @@ APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LI # Program dependencies - specific GL/glut libraries added in Makefiles APP_LIB_DEPS = -lm - +X11_LIBS = -lX11 # Installation directories (for make install) INSTALL_DIR = /usr/local |