changeset 5103:3500563bb2f8 SDL-1.2

Ozkan Sezer to slouken The attached small patch updates SDL's libtoolized files for pe-x86_64 magic, ie win/x64.
author Sam Lantinga <slouken@libsdl.org>
date Wed, 26 Jan 2011 12:26:27 -0800
parents f521f8739611
children 99acf3d856cb
files acinclude/libtool.m4 build-scripts/ltmain.sh
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/acinclude/libtool.m4	Mon Jan 24 14:34:58 2011 -0800
+++ b/acinclude/libtool.m4	Wed Jan 26 12:26:27 2011 -0800
@@ -3014,7 +3014,7 @@
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   lt_cv_deplibs_check_method=pass_all
--- a/build-scripts/ltmain.sh	Mon Jan 24 14:34:58 2011 -0800
+++ b/build-scripts/ltmain.sh	Wed Jan 26 12:26:27 2011 -0800
@@ -2560,7 +2560,7 @@
     ;;
   *ar\ archive*) # could be an import, or static
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 |
 	$SED -n -e '
 	    1,100{