mirror of
https://git.mirrors.martin98.com/https://github.com/google/draco
synced 2025-09-13 04:03:15 +08:00
Remove AOM cruft from arm ios toolchains.
Draco does not need the extra flags, and does not care about AOM's internal configuration variables.
This commit is contained in:
parent
d20fb916c7
commit
606fbb01bb
@ -8,14 +8,6 @@ set(CMAKE_C_COMPILER_ARG1 "-arch ${CMAKE_SYSTEM_PROCESSOR}")
|
|||||||
set(CMAKE_CXX_COMPILER clang++)
|
set(CMAKE_CXX_COMPILER clang++)
|
||||||
set(CMAKE_CXX_COMPILER_ARG1 "-arch ${CMAKE_SYSTEM_PROCESSOR}")
|
set(CMAKE_CXX_COMPILER_ARG1 "-arch ${CMAKE_SYSTEM_PROCESSOR}")
|
||||||
|
|
||||||
# Assembler sources must be converted for ARM iOS targets.
|
|
||||||
set(AOM_ADS2GAS_REQUIRED 1)
|
|
||||||
set(AOM_ADS2GAS "${CMAKE_CURRENT_SOURCE_DIR}/build/make/ads2gas_apple.pl")
|
|
||||||
set(AOM_GAS_EXT "S")
|
|
||||||
|
|
||||||
# No runtime cpu detect for arm*-ios targets.
|
|
||||||
set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "")
|
|
||||||
|
|
||||||
# TODO(tomfinegan): Handle bit code embedding.
|
# TODO(tomfinegan): Handle bit code embedding.
|
||||||
|
|
||||||
endif () # DRACO_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_
|
endif () # DRACO_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_
|
||||||
|
@ -11,10 +11,4 @@ set(CMAKE_OSX_ARCHITECTURES "armv7")
|
|||||||
|
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake")
|
||||||
|
|
||||||
# No intrinsics flag required for armv7s-ios.
|
|
||||||
set(AOM_NEON_INTRIN_FLAG "")
|
|
||||||
|
|
||||||
# No runtime cpu detect for armv7s-ios.
|
|
||||||
set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "")
|
|
||||||
|
|
||||||
endif () # DRACO_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_
|
endif () # DRACO_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_
|
||||||
|
@ -11,10 +11,4 @@ set(CMAKE_OSX_ARCHITECTURES "armv7s")
|
|||||||
|
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake")
|
||||||
|
|
||||||
# No intrinsics flag required for armv7s-ios.
|
|
||||||
set(AOM_NEON_INTRIN_FLAG "")
|
|
||||||
|
|
||||||
# No runtime cpu detect for armv7s-ios.
|
|
||||||
set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "")
|
|
||||||
|
|
||||||
endif () # DRACO_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_
|
endif () # DRACO_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_
|
||||||
|
Loading…
x
Reference in New Issue
Block a user