summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-12-15 16:14:55 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-12-15 16:14:55 +0000
commitb3b725b1e6044d29fb5f484979766d1ef8a7fa9f (patch)
tree89b271c27a71618e92bbade62b35956e22d76ee7 /src
parentf80220d05015c851879f4b347021f98c1690f93b (diff)
Assorted mklib tweaks.
Added Intel icc support to mklib.
Diffstat (limited to 'src')
-rw-r--r--src/glu/sgi/Makefile.X113
-rw-r--r--src/glut/glx/Makefile.X112
-rw-r--r--src/glw/Makefile.X113
3 files changed, 5 insertions, 3 deletions
diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11
index 7202aa84ff..5102528585 100644
--- a/src/glu/sgi/Makefile.X11
+++ b/src/glu/sgi/Makefile.X11
@@ -142,7 +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) $(OBJECTS)
+ $(GLU_LIB_DEPS) -cplusplus -install $(LIBDIR) \
+ $(MKLIB_OPTIONS) $(OBJECTS)
diff --git a/src/glut/glx/Makefile.X11 b/src/glut/glx/Makefile.X11
index 0ef132d451..89b920bea9 100644
--- a/src/glut/glx/Makefile.X11
+++ b/src/glut/glx/Makefile.X11
@@ -103,7 +103,7 @@ targets: $(LIBDIR)/$(GLUT_LIB)
$(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
$(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
-patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIBDIR) \
- $(OBJECTS)
+ $(MKLIB_OPTIONS) $(OBJECTS)
include $(TOP)/Make-config
diff --git a/src/glw/Makefile.X11 b/src/glw/Makefile.X11
index 888aebd52c..b38ef50d4c 100644
--- a/src/glw/Makefile.X11
+++ b/src/glw/Makefile.X11
@@ -46,7 +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) $(OBJECTS)
+ -patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) \
+ $(MKLIB_OPTIONS) $(OBJECTS)
message: