From 2adce66ac42b8d7df9299dbf1981765cccac1290 Mon Sep 17 00:00:00 2001 From: hissingshark Date: Thu, 26 Jul 2018 20:14:11 +0100 Subject: [PATCH] Vero4k autodetection and volume mixer fix --- CMakeLists.txt | 24 ++++++++++++++++++++++++ es-app/src/VolumeControl.cpp | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66d06762e..50a31be43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,12 @@ elseif(EXISTS "/opt/vc/include/bcm_host.h") set(BCMHOST found) set(GLSystem "OpenGL ES" CACHE STRING "The OpenGL system to be used") #------------------------------------------------------------------------------- +#check if we're running on OSMC Vero4K +elseif(EXISTS "/opt/vero3/lib/libMali.so") + MESSAGE("libMali.so found") + set(VERO4K found) + set(GLSystem "OpenGL ES" CACHE STRING "The OpenGL system to be used") +#------------------------------------------------------------------------------- #check if we're running on olinuxino / odroid / etc elseif(EXISTS "/usr/lib/libMali.so" OR EXISTS "/usr/lib/arm-linux-gnueabihf/libMali.so" OR @@ -64,6 +70,10 @@ if(DEFINED BCMHOST) add_definitions(-D_RPI_) endif() +if(DEFINED VERO4K) + add_definitions(-D_VERO4K_) +endif() + if(DEFINED libCEC_FOUND) add_definitions(-DHAVE_LIBCEC) endif() @@ -135,6 +145,11 @@ if(DEFINED BCMHOST) "/opt/vc/include/interface/vmcs_host/linux" "/opt/vc/include/interface/vcos/pthreads" ) +#add include directory for Vero4K +elseif(DEFINED VERO4K) + LIST(APPEND COMMON_INCLUDE_DIRS + "/opt/vero3/include" + ) else() if(${GLSystem} MATCHES "Desktop OpenGL") LIST(APPEND COMMON_INCLUDE_DIRS @@ -153,6 +168,10 @@ if(DEFINED BCMHOST) link_directories( "/opt/vc/lib" ) +elseif(DEFINED VERO4K) + link_directories( + "/opt/vero3/lib" + ) endif() set(COMMON_LIBRARIES @@ -191,6 +210,11 @@ if(DEFINED BCMHOST) brcmEGL ${OPENGLES_LIBRARIES} ) +elseif(DEFINED VERO4K) + LIST(APPEND COMMON_LIBRARIES + EGL + ${OPENGLES_LIBRARIES} + ) else() if(MSVC) LIST(APPEND COMMON_LIBRARIES diff --git a/es-app/src/VolumeControl.cpp b/es-app/src/VolumeControl.cpp index 29b3f3b28..99757d1d4 100644 --- a/es-app/src/VolumeControl.cpp +++ b/es-app/src/VolumeControl.cpp @@ -8,7 +8,7 @@ #endif #if defined(__linux__) - #ifdef _RPI_ + #if defined(_RPI_) || defined(_VERO4K_) const char * VolumeControl::mixerName = "PCM"; #else const char * VolumeControl::mixerName = "Master";