RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-11 09:07:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed'

Browse Source 
* commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed':
  makedef: Add support for identifying the ARM64 machine type

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-11 16:59:36 -03:00
commit ab7c8e1d6c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compat/windows/makedef
View File

@ -74,12 +74,12 @@ else
tr '\t' ' ' | tr '\t' ' ' |
grep '^ \+.\+machine \+(.\+)' | grep '^ \+.\+machine \+(.\+)' |
head -1 | 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 if [ "${arch}" = "x86" ]; then
prefix="_" prefix="_"
else else
if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ]; then if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ] && [ "${arch}" != "ARM64" ]; then
echo "Unknown machine type." >&2 echo "Unknown machine type." >&2
exit 1 exit 1
fi fi