Skip to content

Commit 9e4bfbe

Browse files
committed
0001-android-x86-abi-s-CMAKE_SYSTEM_PROCESSOR-is-i686-you.patch
1 parent a122d23 commit 9e4bfbe

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From e4bab0f25b846b6edaf1df0feb8f6d0bd9a5569f Mon Sep 17 00:00:00 2001
2+
From: qianlongxu <[email protected]>
3+
Date: Wed, 26 Feb 2025 09:29:12 +0800
4+
Subject: [PATCH] android x86 abi 's CMAKE_SYSTEM_PROCESSOR is i686,you can
5+
find the definition in cmake/android.toolchain.cmake
6+
7+
---
8+
source/CMakeLists.txt | 8 +++++---
9+
1 file changed, 5 insertions(+), 3 deletions(-)
10+
11+
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
12+
index 52f9552..8a71dd7 100644
13+
--- a/source/CMakeLists.txt
14+
+++ b/source/CMakeLists.txt
15+
@@ -13,7 +13,8 @@ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" OR
16+
" Unexpected pointer size ${CMAKE_SIZEOF_VOID_P} for ${CMAKE_SYSTEM_PROCESSOR}\n")
17+
endif()
18+
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" OR
19+
- "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86")
20+
+ "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86" OR
21+
+ "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
22+
set(UAVS3D_TARGET_CPU "x86")
23+
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64" OR
24+
"${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64")
25+
@@ -77,8 +78,9 @@ elseif("${UAVS3D_TARGET_CPU}" MATCHES "arm64")
26+
27+
add_definitions(-D _arm64)
28+
enable_language(ASM)
29+
-elseif("${UAVS3D_TARGET_CPU}" MATCHES "loongarch64")
30+
- # loongarch64
31+
+else()
32+
+ # loongarch64,generic
33+
+ message(FATAL_ERROR "unsupported architecture: ${UAVS3D_TARGET_CPU}\n")
34+
endif()
35+
36+
if(COMPILE_10BIT)
37+
--
38+
2.39.5 (Apple Git-154)
39+

0 commit comments

Comments
 (0)