Skip to content

Commit f876bdb

Browse files
committed
Try to fix noasm
1 parent c4d082d commit f876bdb

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

cross_compile_ffmpeg.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,6 +1874,8 @@ build_libx265() {
18741874

18751875
local cmake_params="-DENABLE_SHARED=0" # build x265.exe
18761876

1877+
git apply "$patch_dir/x265_noasm.patch"
1878+
18771879
if [ "$bits_target" = "32" ]; then
18781880
cmake_params+=" -DWINXP_SUPPORT=1" # enable windows xp/vista compatibility in x86 build, since it still can I think...
18791881
fi

patches/x265_noasm.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
2+
index ab5ddfe..f45d03c 100755
3+
--- a/source/CMakeLists.txt
4+
+++ b/source/CMakeLists.txt
5+
@@ -51,7 +51,7 @@ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
6+
list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)
7+
set(POWER_ALIASES powerpc64 powerpc64le ppc64 ppc64le)
8+
list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
9+
-if(X86MATCH GREATER "-1")
10+
+if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
11+
set(X86 1)
12+
add_definitions(-DX265_ARCH_X86=1)
13+
if(CMAKE_CXX_FLAGS STREQUAL "-m32")

0 commit comments

Comments
 (0)