Pass $(MKLIB_OPTIONS) to mklib script to allow setting extra options.

This commit is contained in:
Brian Paul 2003-10-27 18:24:37 +00:00
parent 65e2ab3903
commit 73d4f69283
2 changed files with 3 additions and 2 deletions

View File

@ -33,6 +33,7 @@ VERSION=$(MESA_MAJOR).$(MESA_MINOR)
# ASM_SOURCES optional list of assembly language files to assemble
# MAKELIB the script or command to make a library file
# XXX MAKELIB is obsolete; edit bin/mklib to support new systems
# MKLIB_OPTIONS extra options to pass to the mklib script (like -arch)
aix:

View File

@ -307,7 +307,7 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB) $(LIBMESA)
$(LIBDIR)/$(GL_LIB): $(OBJECTS)
$(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
-minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
$(GL_LIB_DEPS) $(OBJECTS)
$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS)
# Make the OSMesa library
@ -316,7 +316,7 @@ $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
$(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
-minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \
-l$(GL_LIB_NAME) -install $(LIBDIR) \
$(OSMESA_OBJECTS) ; \
$(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \
fi