Pass $(MKLIB_OPTIONS) to mklib script to allow setting extra options.
This commit is contained in:
parent
65e2ab3903
commit
73d4f69283
|
@ -33,6 +33,7 @@ VERSION=$(MESA_MAJOR).$(MESA_MINOR)
|
||||||
# ASM_SOURCES optional list of assembly language files to assemble
|
# ASM_SOURCES optional list of assembly language files to assemble
|
||||||
# MAKELIB the script or command to make a library file
|
# MAKELIB the script or command to make a library file
|
||||||
# XXX MAKELIB is obsolete; edit bin/mklib to support new systems
|
# XXX MAKELIB is obsolete; edit bin/mklib to support new systems
|
||||||
|
# MKLIB_OPTIONS extra options to pass to the mklib script (like -arch)
|
||||||
|
|
||||||
|
|
||||||
aix:
|
aix:
|
||||||
|
|
|
@ -307,7 +307,7 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB) $(LIBMESA)
|
||||||
$(LIBDIR)/$(GL_LIB): $(OBJECTS)
|
$(LIBDIR)/$(GL_LIB): $(OBJECTS)
|
||||||
$(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
|
$(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
|
||||||
-minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
|
-minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
|
||||||
$(GL_LIB_DEPS) $(OBJECTS)
|
$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS)
|
||||||
|
|
||||||
|
|
||||||
# Make the OSMesa library
|
# Make the OSMesa library
|
||||||
|
@ -316,7 +316,7 @@ $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
|
||||||
$(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
|
$(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
|
||||||
-minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \
|
-minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \
|
||||||
-l$(GL_LIB_NAME) -install $(LIBDIR) \
|
-l$(GL_LIB_NAME) -install $(LIBDIR) \
|
||||||
$(OSMESA_OBJECTS) ; \
|
$(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue