diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-01 10:46:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-01 10:46:14 +0000 |
| commit | d4a8565009962e162d86a9c4ae24062a3fa12025 (patch) | |
| tree | bcd249c3c523b23a6350b1d6b5a2cff7518cdb0e /mesalib/configs/default | |
| parent | 6751d9898be671d253d6f7b0806cd4b10daaaf85 (diff) | |
| parent | 0bf07d32cbd460220c67d726900772cf3692746d (diff) | |
| download | vcxsrv-d4a8565009962e162d86a9c4ae24062a3fa12025.tar.gz vcxsrv-d4a8565009962e162d86a9c4ae24062a3fa12025.tar.bz2 vcxsrv-d4a8565009962e162d86a9c4ae24062a3fa12025.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/configs/default')
| -rw-r--r-- | mesalib/configs/default | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesalib/configs/default b/mesalib/configs/default index 9030cf5b9..b05e9fffc 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -86,9 +86,6 @@ GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* VG_LIB_GLOB = $(VG_LIB_NAME)* GLAPI_LIB_GLOB = $(GLAPI_LIB_NAME)* -TALLOC_LIBS = `pkg-config --libs talloc` -TALLOC_CFLAGS = `pkg-config --cflags talloc` - # Optional assembly language optimization files for libGL MESA_ASM_SOURCES = @@ -123,7 +120,7 @@ EGL_CLIENT_APIS = $(GL_LIB) # Library dependencies #EXTRA_LIB_PATH ?= -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread $(TALLOC_LIBS) +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -ldl -lpthread OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm |