Mesa (7.10): darwin: Don't link against libGL when building libOSMesa

Jeremy Huddleston jeremyhu at kemper.freedesktop.org
Wed Jun 8 06:07:03 UTC 2011


Module: Mesa
Branch: 7.10
Commit: 8ea26afd8b2e8d2e66a8b51640b48998878f08dc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ea26afd8b2e8d2e66a8b51640b48998878f08dc

Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Tue Jun  7 13:06:44 2011 -0400

darwin: Don't link against libGL when building libOSMesa

Everything should be resolved through glapi.

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
(cherry picked from commit cebdffaa2a11ef499383a17956c936791e284343)

---

 configs/darwin |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configs/darwin b/configs/darwin
index 3cf1110..ff58014 100644
--- a/configs/darwin
+++ b/configs/darwin
@@ -47,7 +47,7 @@ OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib
 VG_LIB_GLOB = lib$(VG_LIB).*.dylib
 
 GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)  -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt




More information about the mesa-commit mailing list