mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-03-04 10:07:53 +00:00
Merge commit 'cc1c94dacd0642ac1a6cad45deb65071f127d91a'
* commit 'cc1c94dacd0642ac1a6cad45deb65071f127d91a': configure: Pass the right machine types to dlltool for arm and arm64 mingw Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
04a8d5c2d7
4
configure
vendored
4
configure
vendored
@ -4997,6 +4997,10 @@ case $target_os in
|
|||||||
LIBTARGET=i386
|
LIBTARGET=i386
|
||||||
if enabled x86_64; then
|
if enabled x86_64; then
|
||||||
LIBTARGET="i386:x86-64"
|
LIBTARGET="i386:x86-64"
|
||||||
|
elif enabled arm; then
|
||||||
|
LIBTARGET="arm"
|
||||||
|
elif enabled aarch64; then
|
||||||
|
LIBTARGET="arm64"
|
||||||
fi
|
fi
|
||||||
if enabled shared; then
|
if enabled shared; then
|
||||||
# Cannot build both shared and static libs when using dllimport.
|
# Cannot build both shared and static libs when using dllimport.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user