diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-17 10:55:40 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-17 10:55:40 +0200 |
| commit | 6d3ef5c3fe5b69e59e3511202db6a66f71c2f234 (patch) | |
| tree | 3830d989b529135e92edb6004aa368f287ed20c5 /mesalib/configs/default | |
| parent | cf506c799c2281867a28ac33ac985994918bc0ba (diff) | |
| parent | 5d9b8cf0e4054e774f906cde9dd6b61ceca72d44 (diff) | |
| download | vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.gz vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.bz2 vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configs/default')
| -rw-r--r-- | mesalib/configs/default | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mesalib/configs/default b/mesalib/configs/default index 8a8d8f8d2..ea026e632 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -113,15 +113,15 @@ EGL_CLIENT_APIS = $(GL_LIB) # Library dependencies #EXTRA_LIB_PATH ?= -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 -GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 -GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread -GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread -VG_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread -GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread +GL_LIB_DEPS = -lX11 -lXext -lm -lpthread +EGL_LIB_DEPS = -ldl -lpthread +OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) +GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm +GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 +GLESv1_CM_LIB_DEPS = -lpthread +GLESv2_LIB_DEPS = -lpthread +VG_LIB_DEPS = -lpthread +GLAPI_LIB_DEPS = -lpthread # Program dependencies - specific GL libraries added in Makefiles X11_LIBS = -lX11 |