On 24.12.2011 07:29, Brian Paul wrote:
On Fri, Dec 23, 2011 at 4:24 PM, Alexander von Gluck
<kallis...@unixzen.com> wrote:

---
 bin/mklib |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/bin/mklib b/bin/mklib
index 70bd1a2..93dd989 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -959,6 +959,43 @@ case $ARCH in
        fi
       ;;

+       'Haiku')
+               if [ $STATIC = 1 ] ; then
+                       LIBNAME="lib${LIBNAME}.a"
+                       if [ "x$LINK" = "x" ] ; then
+                               # -linker was not specified so set default
link command now
+                               if [ $CPLUSPLUS = 1 ] ; then
+                                       LINK=g++
+                               else
+                                       LINK=gcc
+                               fi
+                       fi
+
+                       OPTS="-ru"
+                       if [ "${ALTOPTS}" ] ; then
+                               OPTS=${ALTOPTS}
+                       fi
+
+                       echo "mklib: Making static library for Haiku: "
${LIBNAME}
+
+                       # expand .a into .o files
+                       NEW_OBJECTS=`expand_archives ${LIBNAME}.obj
$OBJECTS`
+
+                       # make static lib
+                       FINAL_LIBS=`make_ar_static_lib ${OPTS} 1 ${LIBNAME}
${NEW_OBJECTS}`
+
+                       # remove temporary extracted .o files
+                       rm -rf ${LIBNAME}.obj
+        else
+                       LIBNAME="lib${LIBNAME}.so"  # prefix with "lib",
suffix with ".so"
+                       OPTS="-shared"
+
+                       echo "mklib: Making shared library for Haiku: "
${LIBNAME}
+                       ${LINK} ${OPTS} ${LDFLAGS} ${OBJECTS} ${DEPS} -o
${LIBNAME}
+                       FINAL_LIBS="${LIBNAME}"
+               fi
+       ;;
+
    'example')
       # If you're adding support for a new architecture, you can
       # start with this:

Reviewed-by: Brian Paul <bri...@vmware.com>

Do you need me or someone to commit this?

If you feel it's ready.

I'll work on the other changes you noted and re-post them minus this patch :)

-- Alex
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to