|
|
@ -1,11 +1,12 @@
|
|
|
|
--- ./source/CMakeLists.txt.orig 2016-11-08 00:30:22.407038669 +0000
|
|
|
|
diff -up x265_2.2/source/CMakeLists.txt.orig x265_2.2/source/CMakeLists.txt
|
|
|
|
+++ ./source/CMakeLists.txt 2016-11-08 00:58:10.478661484 +0000
|
|
|
|
--- x265_2.2/source/CMakeLists.txt.orig 2016-12-23 06:57:39.000000000 +0100
|
|
|
|
|
|
|
|
+++ x265_2.2/source/CMakeLists.txt 2017-01-03 11:18:34.773738470 +0100
|
|
|
|
@@ -41,9 +41,11 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
|
|
|
|
@@ -41,9 +41,11 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
|
|
|
|
# System architecture detection
|
|
|
|
# System architecture detection
|
|
|
|
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
|
|
|
|
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
|
|
|
|
set(X86_ALIASES x86 i386 i686 x86_64 amd64)
|
|
|
|
set(X86_ALIASES x86 i386 i686 x86_64 amd64)
|
|
|
|
-set(ARM_ALIASES armv6l armv7l)
|
|
|
|
-set(ARM_ALIASES armv6l armv7l)
|
|
|
|
+set(ARMv6_ALIASES armv6l )
|
|
|
|
+set(ARMv6_ALIASES armv6l)
|
|
|
|
+set(ARMv7_ALIASES armv7l)
|
|
|
|
+set(ARMv7_ALIASES armv7l)
|
|
|
|
list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
|
|
|
|
list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
|
|
|
|
-list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
|
|
|
|
-list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
|
|
|
@ -14,10 +15,10 @@
|
|
|
|
set(POWER_ALIASES ppc64 ppc64le)
|
|
|
|
set(POWER_ALIASES ppc64 ppc64le)
|
|
|
|
list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
|
|
|
|
list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
|
|
|
|
if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
|
|
|
|
if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
|
|
|
|
@@ -60,15 +62,24 @@ elseif(POWERMATCH GREATER "-1")
|
|
|
|
@@ -65,15 +67,24 @@ elseif(POWERMATCH GREATER "-1")
|
|
|
|
message(STATUS "Detected POWER target processor")
|
|
|
|
add_definitions(-DPPC64=1)
|
|
|
|
set(POWER 1)
|
|
|
|
message(STATUS "Detected POWER PPC64 target processor")
|
|
|
|
add_definitions(-DX265_ARCH_POWER=1)
|
|
|
|
endif()
|
|
|
|
-elseif(ARMMATCH GREATER "-1")
|
|
|
|
-elseif(ARMMATCH GREATER "-1")
|
|
|
|
+elseif(ARMv6MATCH GREATER "-1")
|
|
|
|
+elseif(ARMv6MATCH GREATER "-1")
|
|
|
|
if(CROSS_COMPILE_ARM)
|
|
|
|
if(CROSS_COMPILE_ARM)
|
|
|
@ -35,7 +36,7 @@
|
|
|
|
+ else()
|
|
|
|
+ else()
|
|
|
|
+ set(CROSS_COMPILE_ARM 0)
|
|
|
|
+ set(CROSS_COMPILE_ARM 0)
|
|
|
|
+ endif()
|
|
|
|
+ endif()
|
|
|
|
+ message(STATUS "Detected ARv7 target processor")
|
|
|
|
+ message(STATUS "Detected ARMv7 target processor")
|
|
|
|
+ set(ARM 1)
|
|
|
|
+ set(ARM 1)
|
|
|
|
+ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1)
|
|
|
|
+ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1)
|
|
|
|
else()
|
|
|
|
else()
|
|
|
|