diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-01-10 22:18:41 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-01-10 22:18:41 +0000 |
| commit | ff3515831e3aed708c2ab7452fa1d470eb1fa1ae (patch) | |
| tree | a9f7cbb947d32d99ef0edd114ec50d1beebfb032 /src/mesa | |
| parent | ae6c594908567e6f980be20cda9a96d8fffe56b7 (diff) | |
added OSMESA_LIB_DEPS needed for some platforms
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile.X11 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index 1fd6f204ed..3031daf068 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -9,8 +9,9 @@ GL_MAJOR = 1 GL_MINOR = 5 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) -GL_LIB_NAME = "GL" # may be overridden in Make-config -OSMESA_LIB_NAME = "OSMesa" # may be overridden in Make-config +# These may be overridden in Make-config +GL_LIB_NAME = GL +OSMESA_LIB_NAME = OSMesa LIBDIR = $(TOP)/lib @@ -104,7 +105,8 @@ $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS) if [ ${OSMESA_LIB} ] ; then \ $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \ -minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \ - -l$(GL_LIB_NAME) -install $(LIBDIR) \ + -l$(GL_LIB_NAME) $(OSMESA_LIB_DEPS) \ + -install $(LIBDIR) \ $(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \ fi |