Update to version 2.1.2

This commit is contained in:
Iwan Timmer
2015-11-24 19:24:33 +01:00
parent 07657529a9
commit 5a064816f6
3 changed files with 17 additions and 14 deletions

View File

@@ -1,8 +1,8 @@
Compile using older version (2.8) of CMake
Index: moonlight-embedded/CMakeLists.txt
===================================================================
--- moonlight-embedded.orig/CMakeLists.txt 2015-08-14 14:05:22.000000000 +0000
+++ moonlight-embedded/CMakeLists.txt 2015-08-14 14:06:06.000000000 +0000
--- moonlight-embedded.orig/CMakeLists.txt 2015-11-24 18:12:41.000000000 +0000
+++ moonlight-embedded/CMakeLists.txt 2015-11-24 18:16:41.000000000 +0000
@@ -1,5 +1,5 @@
project(moonlight-embedded C)
-cmake_minimum_required(VERSION 3.1)
@@ -10,7 +10,7 @@ Index: moonlight-embedded/CMakeLists.txt
SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
include(${CMAKE_ROOT}/Modules/GNUInstallDirs.cmake)
@@ -53,11 +53,11 @@
@@ -58,11 +58,11 @@
add_executable(moonlight ${SRC_LIST})
target_link_libraries(moonlight gamestream)
@@ -24,7 +24,7 @@ Index: moonlight-embedded/CMakeLists.txt
target_link_libraries(moonlight ${CEC_LIBRARIES})
endif()
@@ -65,7 +65,7 @@
@@ -70,7 +70,7 @@
list(APPEND MOONLIGHT_DEFINITIONS HAVE_PI)
aux_source_directory(./third_party/ilclient ILCLIENT_SRC_LIST)
add_library(moonlight-pi SHARED ./src/video/pi.c ${ILCLIENT_SRC_LIST})
@@ -33,17 +33,17 @@ Index: moonlight-embedded/CMakeLists.txt
target_link_libraries(moonlight-pi gamestream ${BROADCOM_LIBRARIES})
set_property(TARGET moonlight-pi PROPERTY COMPILE_DEFINITIONS ${BROADCOM_DEFINITIONS})
install(TARGETS moonlight-pi DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -74,18 +74,18 @@
@@ -79,18 +79,18 @@
if(FREESCALE_FOUND)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_IMX)
add_library(moonlight-imx SHARED ./src/video/imx.c)
- target_include_directories(moonlight-imx PRIVATE ${FREESCALE_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR})
+ include_directories(${FREESCALE_INCLUDE_DIRS})
+ include_directories(${FREESCALE_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR})
target_link_libraries(moonlight-imx gamestream ${FREESCALE_LIBRARIES})
install(TARGETS moonlight-imx DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
if (${SOFTWARE_FOUND})
if (SOFTWARE_FOUND)
- target_include_directories(moonlight PRIVATE ${SDL_INCLUDE_DIRS} ${AVCODEC_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS} ${SWSCALE_INCLUDE_DIRS})
+ include_directories(${SDL_INCLUDE_DIRS} ${AVCODEC_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS} ${SWSCALE_INCLUDE_DIRS})
target_link_libraries(moonlight ${SDL_LIBRARIES} ${AVCODEC_LIBRARIES} ${AVUTIL_LIBRARIES} ${SWSCALE_LIBRARIES})
@@ -57,8 +57,8 @@ Index: moonlight-embedded/CMakeLists.txt
add_subdirectory(docs)
Index: moonlight-embedded/libgamestream/CMakeLists.txt
===================================================================
--- moonlight-embedded.orig/libgamestream/CMakeLists.txt 2015-08-14 14:05:22.000000000 +0000
+++ moonlight-embedded/libgamestream/CMakeLists.txt 2015-08-14 14:10:39.000000000 +0000
--- moonlight-embedded.orig/libgamestream/CMakeLists.txt 2015-11-24 18:12:27.000000000 +0000
+++ moonlight-embedded/libgamestream/CMakeLists.txt 2015-11-24 18:15:27.000000000 +0000
@@ -14,13 +14,13 @@
add_library(moonlight-common SHARED ${MOONLIGHT_COMMON_SRC_LIST})