From 4c3251ec645c8b71820dab7e51e612e5919d4e75 Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 23 Jul 2017 16:59:43 +0200 Subject: sync with upstream --- cmake/scripts/linux/ArchSetup.cmake | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'cmake/scripts/linux/ArchSetup.cmake') diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake index c31becd..bf32fe0 100644 --- a/cmake/scripts/linux/ArchSetup.cmake +++ b/cmake/scripts/linux/ArchSetup.cmake @@ -1,6 +1,10 @@ set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_LINUX) -set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE - -D_FILE_OFFSET_BITS=64) +# temp until further cleanup is done +if(CORE_PLATFORM_NAME_LC STREQUAL rbpi) + list(APPEND ARCH_DEFINES -D_ARMEL -DTARGET_RASPBERRY_PI) +endif() +set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_FILE_DEFINED + -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) set(PLATFORM_DIR linux) set(CMAKE_SYSTEM_NAME Linux) if(WITH_ARCH) @@ -13,6 +17,14 @@ else() set(ARCH i486-linux) set(NEON False) add_options(CXX ALL_BUILDS "-msse") + elseif(CPU STREQUAL arm1176jzf-s) + set(ARCH arm) + set(NEON False) + set(NEON_FLAGS "-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp") + elseif(CPU MATCHES "cortex-a7" OR CPU MATCHES "cortex-a53") + set(ARCH arm) + set(NEON True) + set(NEON_FLAGS "-fPIC -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4 -mvectorize-with-neon-quad") elseif(CPU MATCHES arm) set(ARCH arm) set(NEON True) @@ -44,3 +56,8 @@ endif() if(ENABLE_MIR) set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU since no Mir support" FORCE) endif() + +if(ENABLE_GBM) + set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU" FORCE) + set(ENABLE_VAAPI OFF CACHE BOOL "Disabling VAAPI" FORCE) +endif() -- cgit v1.2.3