X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=mk-dlls.sh.in;h=05c646ae294a08d9ad7068ef52f2f763cd172a9e;hp=da2f39ba8aefc9ab205ad3c3945056e3362baef0;hb=29b24b6ba47681c8a26007492567c3daecb3defe;hpb=36b653e854865c31c56f04d059d78a0d5e3f4e24;ds=sidebyside

diff --git a/mk-dlls.sh.in b/mk-dlls.sh.in
index da2f39ba..05c646ae 100644
--- a/mk-dlls.sh.in
+++ b/mk-dlls.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: mk-dlls.sh.in,v 1.1 2010/09/25 22:29:49 juergen Exp $
+# $Id: mk-dlls.sh.in,v 1.3 2010/12/25 22:25:41 tom Exp $
 ##############################################################################
 # Copyright (c) 2008,2010 Free Software Foundation, Inc.                     #
 #                                                                            #
@@ -32,10 +32,28 @@
 #
 # Build DLLs on MinGW
 #
-LANG=en_US @CC@ -v 2>&1 | grep Target | grep mingw
+LC_ALL=C @CC@ -v 2>&1 | grep Target | grep mingw
 if [ $? -eq 1 ]; then
   echo "$0 requires a mingw environment" >&2
 else
+  mkdir "$TEMP/tmp-dll"
+  cat > "$TEMP/tmp-dll/arch.c" <<EOF
+#include <stdio.h>
+int main()
+{
+    printf("%d",8*sizeof(void*));
+    return(0);
+}
+EOF
+  pushd "$TEMP/tmp-dll"
+    @CC@ -o arch arch.c
+    ARCH=`./arch`
+    cd ..
+    rm -rf tmp-dll
+  popd
+  echo $ARCH > mingw_arch
+  echo Building DLLs and Import Libraries for Win${ARCH}
+
   if [ -d lib ]; then
     cf="-shared"
     lf="--enable-auto-import"
@@ -46,41 +64,43 @@ else
         do
           if [ -f libncurses${t}${m}.a ]; then
             f=libncurses${t}${m}.a
-            g=`basename $f .a | cut -c 4-`
+            g=ncurses${t}${m}
             gi=libw${g}.dll.a
-            td=tmp-${g}
+            td=$TEMP/tmp-${g}
+            bd=`pwd`
             rm -rf "${td}"
             mkdir "${td}"
-            cd "${td}"
-              ar x ../${f} `ar t ../${f}`
-              @CC@ $cf -o w${g}.dll -Wl,--out-implib,${gi} -Wl,--output-def,w${g}.def -Wl,$lf `ar t ../$f` @LIBS@
+            pushd "${td}"
+              ar x "${bd}/${f}" `ar t "${bd}/${f}"`
+              @CC@ $cf -o w${g}.dll -Wl,--out-implib,${gi} -Wl,--output-def,w${g}.def -Wl,$lf `ar t "${bd}/$f"` @LIBS@
               lib //NOLOGO /MACHINE:i386 /DEF:w${g}.def
-              rm -f `ar t ../$f`
-              mv w${g}.dll ..
-              mv w${g}.lib ..
-              mv ${gi} ..
-            cd ..
+              rm -f `ar t "${bd}/$f"`
+              mv w${g}.dll "${bd}"
+              mv w${g}.lib "${bd}"
+              mv ${gi} "${bd}"
+            popd
             rm -rf "${td}"
 
             for l in panel menu form
             do
               for f in lib${l}${t}${m}.a
               do
-                g=`basename $f .a | cut -c 4-`
-                td=tmp-${g}
+                g=${l}${t}${m}
+                td=$TEMP/tmp-${g}
                 gi2=libw${g}.dll.a
+                bd=`pwd`
                 rm -rf "${td}"
                 mkdir "${td}"
                 echo $g
-                cd "${td}"
-                  ar x ../$f `ar t ../$f`
-                  @CC@ $cf -o w${g}.dll -Wl,--out-implib,${gi2} -Wl,--output-def,w${g}.def -Wl,$lf `ar t ../$f` ../${gi} @LIBS@
+                pushd "${td}"
+                  ar x "${bd}/$f" `ar t "${bd}/$f"`
+                  @CC@ $cf -o w${g}.dll -Wl,--out-implib,${gi2} -Wl,--output-def,w${g}.def -Wl,$lf `ar t "${bd}/$f"` "${bd}/${gi}" @LIBS@
                   lib //NOLOGO /MACHINE:i386 /DEF:w${g}.def
-                  rm -f `ar t ../$f`
-                  mv w${g}.dll ..
-                  mv w${g}.lib ..
-                  mv ${gi2} ..
-                cd ..
+                  rm -f `ar t "${bd}/$f"`
+                  mv w${g}.dll "${bd}"
+                  mv w${g}.lib "${bd}"
+                  mv ${gi2} "${bd}"
+                popd
                 rm -rf "${td}"
               done
             done