diff options
author | Martin Storsjö <martin@martin.st> | 2017-11-16 09:32:15 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2017-11-16 16:54:08 +0200 |
commit | bad7ce1d82f0b7da55086b8c6124eff0d35a1b1a (patch) | |
tree | 113aa37b79e22a4234d585d5cc641c4856c668aa /compat | |
parent | d070b9b703a542429a13db9623109ae20474c775 (diff) | |
download | ffmpeg-streaming-bad7ce1d82f0b7da55086b8c6124eff0d35a1b1a.zip ffmpeg-streaming-bad7ce1d82f0b7da55086b8c6124eff0d35a1b1a.tar.gz |
makedef: Pass EXTERN_PREFIX from configure to makedef
This avoids having to use either "dumpbin -headers" to find out
the current architecture, or pass $ARCH from configure to deduce it.
When configuring with --disable-asm, ARCH is equal to "c", which doesn't
give any indication of what symbol prefix is to be used.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'compat')
-rwxr-xr-x | compat/windows/makedef | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/compat/windows/makedef b/compat/windows/makedef index 0cd169c..7258b94 100755 --- a/compat/windows/makedef +++ b/compat/windows/makedef @@ -58,33 +58,7 @@ fi IFS=' ' -# Determine if we're building for x86 or x86_64 and -# set the symbol prefix accordingly. -prefix="" -if [ -n "$NM" ]; then - case $ARCH in - *86) - prefix="_" - ;; - *) - ;; - esac -else - arch=$(dumpbin -headers ${libname} | - tr '\t' ' ' | - grep '^ \+.\+machine \+(.\+)' | - head -1 | - sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(.\{3,5\}\)).*/\1/') - - if [ "${arch}" = "x86" ]; then - prefix="_" - else - if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ] && [ "${arch}" != "ARM64" ]; then - echo "Unknown machine type." >&2 - exit 1 - fi - fi -fi +prefix="$EXTERN_PREFIX" started=0 regex="none" |