Switch back to upstream moonlight-common-c

This commit is contained in:
Iwan Timmer 2021-07-22 20:57:15 +02:00
parent 8f4d9aa5ee
commit d7f9bc0b25
4 changed files with 5 additions and 5 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "common"] [submodule "common"]
path = third_party/moonlight-common-c path = third_party/moonlight-common-c
url = https://github.com/irtimmer/moonlight-common-c.git url = https://github.com/moonlight-stream/moonlight-common-c.git

View File

@ -32,7 +32,7 @@ Bugs can be reported to the [issue tracker](https://github.com/irtimmer/moonligh
## See also ## See also
[Moonlight-common-c](https://github.com/irtimmer/moonlight-common-c) is a fork of moonlight-common-c used by Moonlight Embedded [Moonlight-common-c](https://github.com/moonlight-stream/moonlight-common-c) is the shared codebase between different Moonlight implementations
## Contribute ## Contribute

View File

@ -7,11 +7,11 @@ find_package(OpenSSL 1.0.2 REQUIRED)
find_package(EXPAT REQUIRED) find_package(EXPAT REQUIRED)
pkg_check_modules(AVAHI REQUIRED avahi-client) pkg_check_modules(AVAHI REQUIRED avahi-client)
pkg_check_modules(ENET REQUIRED libenet)
aux_source_directory(./ GAMESTREAM_SRC_LIST) aux_source_directory(./ GAMESTREAM_SRC_LIST)
aux_source_directory(../third_party/h264bitstream 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) aux_source_directory(../third_party/moonlight-common-c/src MOONLIGHT_COMMON_SRC_LIST)
aux_source_directory(../third_party/moonlight-common-c/reedsolomon MOONLIGHT_COMMON_SRC_LIST) aux_source_directory(../third_party/moonlight-common-c/reedsolomon MOONLIGHT_COMMON_SRC_LIST)
@ -24,7 +24,7 @@ set_target_properties(gamestream PROPERTIES SOVERSION ${SO_VERSION} VERSION ${PR
set_target_properties(moonlight-common PROPERTIES SOVERSION ${SO_VERSION} VERSION ${PROJECT_VERSION}) set_target_properties(moonlight-common PROPERTIES SOVERSION ${SO_VERSION} VERSION ${PROJECT_VERSION})
target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c/src ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS}) 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 ../third_party/moonlight-common-c/reedsolomon ${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(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES} ${LIBUUID_LIBRARIES})
target_link_libraries(moonlight-common ${ENET_LIBRARIES}) target_link_libraries(moonlight-common ${ENET_LIBRARIES})

@ -1 +1 @@
Subproject commit eacf5f9e515f44edfd38a52509911c8c0801e032 Subproject commit 8abc371fb4c970b7cfae0860789e98fbb90ed231