diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/platform/rbpi/defines.txt | 1 | ||||
| -rw-r--r-- | cmake/scripts/common/AddonHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/linux/ArchSetup.cmake | 16 | ||||
| -rw-r--r-- | cmake/scripts/linux/Install.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/rbpi/ArchSetup.cmake | 35 | ||||
| l--------- | cmake/scripts/rbpi/ExtraTargets.cmake | 1 | ||||
| l--------- | cmake/scripts/rbpi/Install.cmake | 1 | ||||
| l--------- | cmake/scripts/rbpi/Macros.cmake | 1 | ||||
| l--------- | cmake/scripts/rbpi/PathSetup.cmake | 1 | ||||
| -rw-r--r-- | cmake/treedata/rbpi/omxplayer.txt | 1 | ||||
| -rw-r--r-- | cmake/treedata/rbpi/subdirs.txt | 13 |
12 files changed, 17 insertions, 59 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ede95f16ff..5be072d68d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ if(NOT WIN32) option(WITH_ARCH "build with given arch" OFF) option(WITH_CPU "build with given cpu" OFF) endif() -if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL rbpi) +if(CORE_SYSTEM_NAME STREQUAL linux) option(ENABLE_LIRC "Enable LIRC support?" ON) option(ENABLE_EVENTCLIENTS "Enable event clients support?" OFF) endif() diff --git a/cmake/platform/rbpi/defines.txt b/cmake/platform/rbpi/defines.txt deleted file mode 100644 index 08fe4cbdd2..0000000000 --- a/cmake/platform/rbpi/defines.txt +++ /dev/null @@ -1 +0,0 @@ --DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI diff --git a/cmake/scripts/common/AddonHelpers.cmake b/cmake/scripts/common/AddonHelpers.cmake index 6808628bec..92cd0b1389 100644 --- a/cmake/scripts/common/AddonHelpers.cmake +++ b/cmake/scripts/common/AddonHelpers.cmake @@ -290,7 +290,7 @@ macro (build_addon target prefix libs) endif() add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext}) else() - if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL rbpi OR CORE_SYSTEM_NAME STREQUAL freebsd) + if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd) if(NOT OVERRIDE_PATHS) if(CMAKE_INSTALL_PREFIX AND NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT CMAKE_INSTALL_PREFIX STREQUAL "${${APP_NAME_UC}_PREFIX}") message(WARNING "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} differs from ${APP_NAME} prefix, changing to ${${APP_NAME_UC}_PREFIX}. Please pass -DOVERRIDE_PATHS=1 to skip this check") diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake index 8a5bbaab16..bf32fe0c6b 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) diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake index e72bffc46d..7a2705be18 100644 --- a/cmake/scripts/linux/Install.cmake +++ b/cmake/scripts/linux/Install.cmake @@ -302,7 +302,7 @@ endforeach() # generate packages? yes please, if everything checks out if(CPACK_GENERATOR) - if(CPACK_GENERATOR STREQUAL DEB AND ( CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL rbpi ) ) + if(CPACK_GENERATOR STREQUAL DEB AND CORE_SYSTEM_NAME STREQUAL linux) if(CMAKE_BUILD_TYPE STREQUAL Debug) message(STATUS "DEB Generator: Build type is set to 'Debug'. Packaged binaries will be unstripped.") endif() diff --git a/cmake/scripts/rbpi/ArchSetup.cmake b/cmake/scripts/rbpi/ArchSetup.cmake deleted file mode 100644 index 6fc2c21706..0000000000 --- a/cmake/scripts/rbpi/ArchSetup.cmake +++ /dev/null @@ -1,35 +0,0 @@ -set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI - -DHAS_OMXPLAYER -DHAVE_OMXLIB) -set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE - -D_FILE_OFFSET_BITS=64) -set(PLATFORM_DIR linux) - -string(REGEX REPLACE "[ ]+" ";" SYSTEM_LDFLAGS "$ENV{LDFLAGS}") -set(CMAKE_SYSTEM_NAME Linux) - -if(WITH_ARCH) - set(ARCH ${WITH_ARCH}) -else() - if(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") - else() - message(SEND_ERROR "Unknown CPU: ${CPU}") - endif() -endif() - -# Make sure we strip binaries in Release build -if(CMAKE_BUILD_TYPE STREQUAL Release AND CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") -endif() - -find_package(CXX11 REQUIRED) - -set(MMAL_FOUND 1 CACHE INTERNAL "MMAL") -set(OMX_FOUND 1 CACHE INTERNAL "OMX") -set(OMXLIB_FOUND 1 CACHE INTERNAL "OMX") diff --git a/cmake/scripts/rbpi/ExtraTargets.cmake b/cmake/scripts/rbpi/ExtraTargets.cmake deleted file mode 120000 index e757c60298..0000000000 --- a/cmake/scripts/rbpi/ExtraTargets.cmake +++ /dev/null @@ -1 +0,0 @@ -../linux/ExtraTargets.cmake
\ No newline at end of file diff --git a/cmake/scripts/rbpi/Install.cmake b/cmake/scripts/rbpi/Install.cmake deleted file mode 120000 index 28ce0129b9..0000000000 --- a/cmake/scripts/rbpi/Install.cmake +++ /dev/null @@ -1 +0,0 @@ -../linux/Install.cmake
\ No newline at end of file diff --git a/cmake/scripts/rbpi/Macros.cmake b/cmake/scripts/rbpi/Macros.cmake deleted file mode 120000 index 2fdbb255f9..0000000000 --- a/cmake/scripts/rbpi/Macros.cmake +++ /dev/null @@ -1 +0,0 @@ -../linux/Macros.cmake
\ No newline at end of file diff --git a/cmake/scripts/rbpi/PathSetup.cmake b/cmake/scripts/rbpi/PathSetup.cmake deleted file mode 120000 index 6786c1c131..0000000000 --- a/cmake/scripts/rbpi/PathSetup.cmake +++ /dev/null @@ -1 +0,0 @@ -../linux/PathSetup.cmake
\ No newline at end of file diff --git a/cmake/treedata/rbpi/omxplayer.txt b/cmake/treedata/rbpi/omxplayer.txt deleted file mode 100644 index d56f1df87e..0000000000 --- a/cmake/treedata/rbpi/omxplayer.txt +++ /dev/null @@ -1 +0,0 @@ -xbmc/cores/omxplayer cores/omxplayer diff --git a/cmake/treedata/rbpi/subdirs.txt b/cmake/treedata/rbpi/subdirs.txt deleted file mode 100644 index 8dfeba67d1..0000000000 --- a/cmake/treedata/rbpi/subdirs.txt +++ /dev/null @@ -1,13 +0,0 @@ -xbmc/linux linuxsupport -xbmc/input/linux input/linux -xbmc/input/touch input/touch -xbmc/input/touch/generic input/touch/generic -xbmc/network/linux network/linux -xbmc/peripherals/bus/linux peripherals/bus/linux -xbmc/powermanagement/linux powermanagement/linux -xbmc/storage/linux storage/linux -xbmc/filesystem/posix filesystem/posix -xbmc/utils/posix utils_posix -xbmc/platform/posix posix -xbmc/windowing/rpi windowing/rpi # EGL -xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi |