Merge pull request #232 from d3m3vilurr/bump-libgamestream

Update libgamestream

CMakeLists.txt

@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.8)
 set(CMAKE_SYSTEM_NAME "Generic")
 set(CMAKE_C_COMPILER "arm-vita-eabi-gcc")
 set(CMAKE_CXX_COMPILER "arm-vita-eabi-g++")
+add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-pointer-sign -Wno-sign-compare -Wno-switch)
+
+#aux_source_directory(./src SRC_LIST)
 
 project(moonlight)
 set(TITLE_ID "XYZZ00002")

README.md

@@ -34,3 +34,13 @@ make
 
 [moonlight]: https://github.com/moonlight-stream
 [reflection]: http://www.publicdomainpictures.net/view-image.php?image=130014&picture=moonlight-reflection
+
+## See also
+
+[Moonlight-common-c](https://github.com/moonlight-stream/moonlight-common-c) is the shared codebase between different Moonlight implementations
+
+## Contribute
+
+1. Fork us
+2. Write code
+3. Send Pull Requests

libgamestream/CMakeLists.txt

@@ -5,11 +5,11 @@ find_package(OpenSSL REQUIRED)
 find_package(EXPAT REQUIRED)
 
 pkg_check_modules(AVAHI REQUIRED avahi-client)
-pkg_check_modules(ENET REQUIRED libenet)
 
 aux_source_directory(./ GAMESTREAM_SRC_LIST)
 aux_source_directory(../third_party/h264bitstream GAMESTREAM_SRC_LIST)
 
+aux_source_directory(../third_party/moonlight-common-c/enet MOONLIGHT_COMMON_SRC_LIST)
 aux_source_directory(../third_party/moonlight-common-c/src MOONLIGHT_COMMON_SRC_LIST)
 
 add_library(moonlight-common SHARED ${MOONLIGHT_COMMON_SRC_LIST})
@@ -22,9 +22,8 @@ set_target_properties(gamestream PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERS
 set_target_properties(moonlight-common PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION})
 
 target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c/src ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS})
-target_include_directories(moonlight-common PRIVATE  ${ENET_INCLUDE_DIRS})
+target_include_directories(moonlight-common PRIVATE ../third_party/moonlight-common-c/reedsolomon ../third_party/moonlight-common-c/enet/include)
 target_link_libraries(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES} ${LIBUUID_LIBRARIES})
-target_link_libraries(moonlight-common ${ENET_LIBRARIES})
 
 target_link_libraries(gamestream ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})