From 0c9fbf825649df2502925bc33caa962d4b0d118d Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 26 Jan 2011 12:23:32 -0800 Subject: [PATCH] Ozkan Sezer to slouken The attached small patch updates SDL's libtoolized files for pe-x86_64 magic, ie win/x64. --- acinclude/libtool.m4 | 2 +- build-scripts/ltmain.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acinclude/libtool.m4 b/acinclude/libtool.m4 index 6894db826..b64223e2e 100644 --- a/acinclude/libtool.m4 +++ b/acinclude/libtool.m4 @@ -3014,7 +3014,7 @@ mingw* | pw32*) 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 diff --git a/build-scripts/ltmain.sh b/build-scripts/ltmain.sh index d2b860f42..5e04f0862 100644 --- a/build-scripts/ltmain.sh +++ b/build-scripts/ltmain.sh @@ -2560,7 +2560,7 @@ func_win32_libid () ;; *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{