[cmake, build] fix android and aarch64
All checks were successful
eden-license / license-header (pull_request) Successful in 38s
All checks were successful
eden-license / license-header (pull_request) Successful in 38s
This commit is contained in:
parent
e1763a726e
commit
88b3842fb8
3 changed files with 3 additions and 3 deletions
|
@ -415,7 +415,7 @@ if(ENABLE_OPENSSL)
|
|||
find_package(OpenSSL 1.1.1 REQUIRED)
|
||||
endif()
|
||||
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID)
|
||||
find_package(gamemode 1.7 MODULE)
|
||||
endif()
|
||||
|
||||
|
|
2
externals/CMakeLists.txt
vendored
2
externals/CMakeLists.txt
vendored
|
@ -211,7 +211,7 @@ if (ANDROID)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT TARGET gamemode::headers)
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID AND NOT TARGET gamemode::headers)
|
||||
add_library(gamemode INTERFACE)
|
||||
target_include_directories(gamemode INTERFACE gamemode)
|
||||
add_library(gamemode::headers ALIAS gamemode)
|
||||
|
|
|
@ -1212,7 +1212,7 @@ if (HAS_NCE)
|
|||
arm/nce/patcher.h
|
||||
arm/nce/visitor_base.h
|
||||
)
|
||||
target_link_libraries(core PRIVATE merry::oaknut)
|
||||
target_link_libraries(core PRIVATE merry::mcl merry::oaknut)
|
||||
endif()
|
||||
|
||||
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue