TOP = ../..
GL_MAJOR = 1
-GL_MINOR = 4
+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
# This should get set in Make-config someday:
DRIVER_SOURCES = \
+ $(COMMON_DRIVER_SOURCES) \
$(X11_DRIVER_SOURCES) \
$(GLIDE_DRIVER_SOURCES) \
$(SVGA_DRIVER_SOURCES) \
$(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) \
- $(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \
+ -minor $(MESA_MINOR) -patch $(GL_TINY) \
+ $(MKLIB_OPTIONS) -install $(LIBDIR) \
+ $(OSMESA_LIB_DEPS) $(OSMESA_OBJECTS) ; \
fi