blob: f9fe658fd426c06b1f3ea1cf06e20813d47aa388 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
unbreak my arrrrrrrrrrrrrrrrm
say you'll run on me again
undo this hurt you caused
when you built with neon
and sigill'd on erin
uncry these tears
i cried so many nights
unbreak my arrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrm
myyyyyyyyy arm...
--- x265_v2.6/source/CMakeLists.txt.old 2017-11-29 03:21:40.000000000 +0000
+++ x265_v2.6/source/CMakeLists.txt 2018-06-09 10:34:57.239447833 +0000
@@ -226,11 +226,11 @@
set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
elseif(ARM)
find_package(Neon)
- if(CPU_HAS_NEON)
+ if(CPU_HAS_NEON AND NATIVE_BUILD)
set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
add_definitions(-DHAVE_NEON)
else()
- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+ set(ARM_ARGS -mfloat-abi=hard)
endif()
endif()
add_definitions(${ARM_ARGS})
|
