Rename OMX module to Pi because of naming conflict

This commit is contained in:
Iwan Timmer
2015-08-13 11:23:57 +02:00
parent e6c4495ed5
commit d0da5ea29e
5 changed files with 16 additions and 16 deletions

View File

@@ -17,7 +17,7 @@ find_package(ALSA REQUIRED)
find_package(Opus REQUIRED)
find_package(Broadcom)
find_package(Freescale)
find_package(CEC)
find_package(CEC 3.0)
find_package(PkgConfig REQUIRED)
pkg_check_modules(EVDEV REQUIRED libevdev)
@@ -27,7 +27,7 @@ pkg_check_modules(AVCODEC libavcodec)
pkg_check_modules(AVUTIL libavutil)
pkg_check_modules(SWSCALE libswscale)
if(CEC_FOUND)
if(CEC_FOUND AND CEC_VERSION_COMPATIBLE)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC)
endif()
@@ -40,8 +40,8 @@ endif()
if(BROADCOM_FOUND)
aux_source_directory(./third_party/ilclient SRC_LIST)
list(APPEND SRC_LIST ./src/video/omx.c)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_OMX)
list(APPEND SRC_LIST ./src/video/pi.c)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_PI)
endif()
if(FREESCALE_FOUND)
@@ -66,7 +66,7 @@ add_executable(moonlight ${SRC_LIST})
target_link_libraries(moonlight PUBLIC gamestream)
set_property(TARGET moonlight PROPERTY C_STANDARD 11)
if (CEC_FOUND)
if (CEC_FOUND AND CEC_VERSION_COMPATIBLE)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC)
target_include_directories(moonlight PRIVATE ./third_party/libcec ${CEC_INCLUDE_DIRS}/libcec)
target_link_libraries (moonlight PUBLIC ${CEC_LIBRARIES})