mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-02-21 16:30:29 +01:00
re-order arguments to mklib
This commit is contained in:
parent
f28570679f
commit
77b47bb27b
4 changed files with 9 additions and 10 deletions
|
|
@ -142,8 +142,8 @@ targets: $(LIBDIR)/$(GLU_LIB)
|
|||
$(LIBDIR)/$(GLU_LIB): $(OBJECTS)
|
||||
$(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
|
||||
-minor $(GLU_MINOR) -patch $(GLU_TINY) \
|
||||
$(GLU_LIB_DEPS) -cplusplus -install $(LIBDIR) \
|
||||
$(MKLIB_OPTIONS) $(OBJECTS)
|
||||
$(MKLIB_OPTIONS) -cplusplus -install $(LIBDIR) \
|
||||
$(GLU_LIB_DEPS) $(OBJECTS)
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -102,8 +102,8 @@ targets: $(LIBDIR)/$(GLUT_LIB)
|
|||
# Make the library
|
||||
$(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
|
||||
$(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
|
||||
-patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIBDIR) \
|
||||
$(MKLIB_OPTIONS) $(OBJECTS)
|
||||
-patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \
|
||||
$(GLUT_LIB_DEPS) $(OBJECTS)
|
||||
|
||||
include $(TOP)/Make-config
|
||||
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message
|
|||
# Make the library
|
||||
$(LIBDIR)/$(GLW_LIB): $(OBJECTS)
|
||||
$(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \
|
||||
-patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) \
|
||||
$(MKLIB_OPTIONS) $(OBJECTS)
|
||||
-patch $(TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \
|
||||
$(GLW_LIB_DEPS) $(OBJECTS)
|
||||
|
||||
|
||||
message:
|
||||
|
|
|
|||
|
|
@ -105,10 +105,9 @@ $(LIBDIR)/$(GL_LIB): $(OBJECTS)
|
|||
$(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) $(OSMESA_LIB_DEPS) \
|
||||
-install $(LIBDIR) \
|
||||
$(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \
|
||||
-minor $(MESA_MINOR) -patch $(GL_TINY) \
|
||||
$(MKLIB_OPTIONS) -install $(LIBDIR) \
|
||||
$(OSMESA_LIB_DEPS) $(OSMESA_OBJECTS) ; \
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue