Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #467 from hissingshark/master

Browse source 
Vero4k autodetection and volume mixer fix
This commit is contained in:
Jools Wills 2018-07-26 20:56:56 +01:00 committed by GitHub
parent de021ca00f 2adce66ac4
commit b3abc30211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
CMakeLists.txt
View file

@ -25,6 +25,12 @@ elseif(EXISTS "/opt/vc/include/bcm_host.h")
set(BCMHOST found) set(BCMHOST found)
set(GLSystem "OpenGL ES" CACHE STRING "The OpenGL system to be used") 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 #check if we're running on olinuxino / odroid / etc
elseif(EXISTS "/usr/lib/libMali.so" OR elseif(EXISTS "/usr/lib/libMali.so" OR
EXISTS "/usr/lib/arm-linux-gnueabihf/libMali.so" OR EXISTS "/usr/lib/arm-linux-gnueabihf/libMali.so" OR
@ -64,6 +70,10 @@ if(DEFINED BCMHOST)
add_definitions(-D_RPI_) add_definitions(-D_RPI_)
endif() endif()
if(DEFINED VERO4K)
add_definitions(-D_VERO4K_)
endif()
if(DEFINED libCEC_FOUND) if(DEFINED libCEC_FOUND)
add_definitions(-DHAVE_LIBCEC) add_definitions(-DHAVE_LIBCEC)
endif() endif()
@ -135,6 +145,11 @@ if(DEFINED BCMHOST)
"/opt/vc/include/interface/vmcs_host/linux" "/opt/vc/include/interface/vmcs_host/linux"
"/opt/vc/include/interface/vcos/pthreads" "/opt/vc/include/interface/vcos/pthreads"
) )
#add include directory for Vero4K
elseif(DEFINED VERO4K)
LIST(APPEND COMMON_INCLUDE_DIRS
"/opt/vero3/include"
)
else() else()
if(${GLSystem} MATCHES "Desktop OpenGL") if(${GLSystem} MATCHES "Desktop OpenGL")
LIST(APPEND COMMON_INCLUDE_DIRS LIST(APPEND COMMON_INCLUDE_DIRS
@ -153,6 +168,10 @@ if(DEFINED BCMHOST)
link_directories( link_directories(
"/opt/vc/lib" "/opt/vc/lib"
) )
elseif(DEFINED VERO4K)
link_directories(
"/opt/vero3/lib"
)
endif() endif()
set(COMMON_LIBRARIES set(COMMON_LIBRARIES
@ -191,6 +210,11 @@ if(DEFINED BCMHOST)
brcmEGL brcmEGL
${OPENGLES_LIBRARIES} ${OPENGLES_LIBRARIES}
) )
elseif(DEFINED VERO4K)
LIST(APPEND COMMON_LIBRARIES
EGL
${OPENGLES_LIBRARIES}
)
else() else()
if(MSVC) if(MSVC)
LIST(APPEND COMMON_LIBRARIES LIST(APPEND COMMON_LIBRARIES

2
es-app/src/VolumeControl.cpp
View file

@ -8,7 +8,7 @@
#endif #endif
#if defined(__linux__) #if defined(__linux__)
#ifdef _RPI_ #if defined(_RPI_) || defined(_VERO4K_)
const char * VolumeControl::mixerName = "PCM"; const char * VolumeControl::mixerName = "PCM";
#else #else
const char * VolumeControl::mixerName = "Master"; const char * VolumeControl::mixerName = "Master";