From 4830f27a40323fe859dc166337a2b861877b7121 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 1 Jan 2018 13:40:09 +0100 Subject: sync with upstream --- cmake/scripts/android/ArchSetup.cmake | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'cmake/scripts/android/ArchSetup.cmake') diff --git a/cmake/scripts/android/ArchSetup.cmake b/cmake/scripts/android/ArchSetup.cmake index 7b8b466..03056fa 100644 --- a/cmake/scripts/android/ArchSetup.cmake +++ b/cmake/scripts/android/ArchSetup.cmake @@ -6,15 +6,22 @@ endif() set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID) set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE - -D_FILE_OFFSET_BITS=64) -set(PLATFORM_DIR linux) + -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64=1) + +# Main cpp +set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/android/activity/XBMCApp.cpp) + +set(PLATFORM_DIR platform/linux) if(WITH_ARCH) set(ARCH ${WITH_ARCH}) else() if(CPU STREQUAL armeabi-v7a) set(ARCH arm) set(NEON True) - set(NEON_FLAGS "-mfpu=neon -mvectorize-with-neon-quad") + set(NEON_FLAGS "-mfpu=neon") + if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX) + set(NEON_FLAGS "${NEON_FLAGS} -mvectorize-with-neon-quad") + endif() elseif(CPU STREQUAL arm64-v8a) set(ARCH aarch64) set(NEON True) @@ -26,6 +33,9 @@ else() endif() endif() +# Additional SYSTEM_DEFINES +list(APPEND SYSTEM_DEFINES -DHAS_ZEROCONF) + set(ENABLE_X11 OFF CACHE BOOL "" FORCE) set(ENABLE_AML OFF CACHE BOOL "" FORCE) set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE) -- cgit v1.2.3