mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 13:28:01 +08:00
[aom] Enable arm, arm64 target support for Windows Desktop. (#28739)
This commit is contained in:
parent
94e85d15fb
commit
3512f2666b
@ -20,8 +20,9 @@ vcpkg_from_git(
|
||||
)
|
||||
|
||||
set(aom_target_cpu "")
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
if(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^arm"))
|
||||
# UWP + aom's assembler files result in weirdness and build failures
|
||||
# Also, disable assembly on ARM and ARM64 Windows to fix compilation issues.
|
||||
set(aom_target_cpu "-DAOM_TARGET_CPU=generic")
|
||||
endif()
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
{
|
||||
"name": "aom",
|
||||
"version-semver": "3.5.0",
|
||||
"port-version": 1,
|
||||
"description": "AV1 codec library",
|
||||
"homepage": "https://aomedia.googlesource.com/aom",
|
||||
"license": "BSD-2-Clause",
|
||||
"supports": "!(windows & arm & !uwp)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "daaa6d5ccf417cb9e4997d35b9574f18eaa98cd3",
|
||||
"version-semver": "3.5.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "c6e0216430b4aded29b420b2d9e4b14ef6271620",
|
||||
"version-semver": "3.5.0",
|
||||
|
@ -122,7 +122,7 @@
|
||||
},
|
||||
"aom": {
|
||||
"baseline": "3.5.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"approval-tests-cpp": {
|
||||
"baseline": "10.12.2",
|
||||
|
Loading…
x
Reference in New Issue
Block a user