parent
f80220d050
commit
b3b725b1e6
|
@ -461,7 +461,7 @@ linux-x86-sse:
|
|||
"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
|
||||
"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
|
||||
"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
|
||||
"APP_LIB_DEPS = -lm" \
|
||||
"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
|
||||
"ASM_SOURCES = $(X86_SOURCES)"
|
||||
|
||||
linux-icc:
|
||||
|
@ -477,8 +477,9 @@ linux-icc:
|
|||
"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
|
||||
"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
|
||||
"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
|
||||
"APP_LIB_DEPS = -lm" \
|
||||
"ASM_SOURCES = $(X86_SOURCES)"
|
||||
"APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
|
||||
"ASM_SOURCES = $(X86_SOURCES)" \
|
||||
"MKLIB_OPTIONS = -arch icc"
|
||||
|
||||
# Contributed by Uwe_Maurer@t-online.de
|
||||
linux-ggi:
|
||||
|
|
40
bin/mklib
40
bin/mklib
|
@ -335,6 +335,46 @@ case $ARCH in
|
|||
FINAL_LIBS="${LIBNAME}"
|
||||
;;
|
||||
|
||||
'icc')
|
||||
# Intel C compiler
|
||||
LIBNAME="lib${LIBNAME}" # prefix with "lib"
|
||||
|
||||
if [ $STATIC = 1 ] ; then
|
||||
echo "mklib: Making Intel ICC static library: " ${LIBNAME}.a
|
||||
LINK="ar"
|
||||
OPTS="-ruv"
|
||||
# make lib
|
||||
${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
|
||||
# finish up
|
||||
FINAL_LIBS="${LIBNAME}.a"
|
||||
else
|
||||
OPTS="-shared"
|
||||
VERSION="${MAJOR}.${MINOR}.${PATCH}"
|
||||
|
||||
echo "mklib: Making Intel ICC shared library: " ${LIBNAME}.so.${VERSION}
|
||||
|
||||
if [ $CPLUSPLUS = 1 ] ; then
|
||||
LINK="icc"
|
||||
else
|
||||
LINK="icc"
|
||||
fi
|
||||
|
||||
# rm any old libs
|
||||
rm -f ${LIBNAME}.so.${VERSION}
|
||||
rm -f ${LIBNAME}.so.${MAJOR}
|
||||
rm -f ${LIBNAME}.so
|
||||
|
||||
# make lib
|
||||
${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
|
||||
# make usual symlinks
|
||||
ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
|
||||
ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
|
||||
# finish up
|
||||
FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
|
||||
fi
|
||||
;;
|
||||
|
||||
|
||||
'example')
|
||||
# If you're adding support for a new architecture, you can
|
||||
# start with this:
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue