diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:59:36 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:59:36 -0300 |
| commit | ab7c8e1d6cc976c796735caa1e9210cf06792111 (patch) | |
| tree | 3f9edc290815651daf2fcdd454368b0e286c65f1 | |
| parent | 1338cc1ac2933aed04ef3a6adc1f4c305e6b2435 (diff) | |
| parent | a37e84be69310cd7de9540c8bc194cb0a6d158ed (diff) | |
| download | ffmpeg-streaming-ab7c8e1d6cc976c796735caa1e9210cf06792111.zip ffmpeg-streaming-ab7c8e1d6cc976c796735caa1e9210cf06792111.tar.gz | |
Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed'
* commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed':
makedef: Add support for identifying the ARM64 machine type
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | compat/windows/makedef | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compat/windows/makedef b/compat/windows/makedef index fd7959a..0cd169c 100755 --- a/compat/windows/makedef +++ b/compat/windows/makedef @@ -74,12 +74,12 @@ else tr '\t' ' ' | grep '^ \+.\+machine \+(.\+)' | head -1 | - sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(...\)).*/\1/') + sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(.\{3,5\}\)).*/\1/') if [ "${arch}" = "x86" ]; then prefix="_" else - if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ]; then + if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ] && [ "${arch}" != "ARM64" ]; then echo "Unknown machine type." >&2 exit 1 fi |
