From 31790c101af30ca9571c6923d3c3dccc8e3e5f0a Mon Sep 17 00:00:00 2001 From: Bohdan Shulyar Date: Tue, 30 May 2023 15:43:37 +0300 Subject: [PATCH] cmake: LibraryNaming: fix Android check --- cmake/LibraryNaming.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/LibraryNaming.cmake b/cmake/LibraryNaming.cmake index e233a7de..0ffae76f 100644 --- a/cmake/LibraryNaming.cmake +++ b/cmake/LibraryNaming.cmake @@ -36,12 +36,14 @@ endmacro() # grep '^#undef XASH' build.h | grep "XASH_RISCV_" | awk '{ print "check_build_target(" $2 ")"}' # echo "endif()" +# NOTE: Android must have priority over Linux to work correctly! + set(CMAKE_REQUIRED_INCLUDES "${PROJECT_SOURCE_DIR}/public/") check_build_target(XASH_64BIT) check_group_build_target(XASH_WIN32 XASH_PLATFORM) +check_group_build_target(XASH_ANDROID XASH_PLATFORM) check_group_build_target(XASH_LINUX XASH_PLATFORM) check_group_build_target(XASH_FREEBSD XASH_PLATFORM) -check_group_build_target(XASH_ANDROID XASH_PLATFORM) check_group_build_target(XASH_APPLE XASH_PLATFORM) check_group_build_target(XASH_NETBSD XASH_PLATFORM) check_group_build_target(XASH_OPENBSD XASH_PLATFORM)