moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-07-01 15:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build with new moonlight-common-c source layout

Browse Source
This commit is contained in:
Cameron Gutman 2016-04-01 00:31:32 -04:00
parent d55d47dbec
commit c6c4e5102c
20 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -41,7 +41,7 @@ else()
set(SOFTWARE_FOUND FALSE)
endif()
SET(MOONLIGHT_COMMON_INCLUDE_DIR ./third_party/moonlight-common-c)
SET(MOONLIGHT_COMMON_INCLUDE_DIR ./third_party/moonlight-common-c/src)
SET(GAMESTREAM_INCLUDE_DIR ./libgamestream)
if(CMAKE_BUILD_TYPE MATCHES Debug)

5
libgamestream/CMakeLists.txt
View File

@ -10,8 +10,7 @@ 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/limelight-common MOONLIGHT_COMMON_SRC_LIST)
aux_source_directory(../third_party/moonlight-common-c/limelight-common/OpenAES 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,7 +21,7 @@ target_link_libraries(gamestream moonlight-common)
set_target_properties(gamestream PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION})
set_target_properties(moonlight-common PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION})
target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c ../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 ${ENET_INCLUDE_DIRS})
target_link_libraries(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES} ${LIBUUID_LIBRARIES})
target_link_libraries(moonlight-common ${ENET_LIBRARIES})

2
libgamestream/client.c
View File

@ -23,7 +23,7 @@
#include "client.h"
#include "errors.h"
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <sys/stat.h>
#include <stdbool.h>

2
libgamestream/client.h
View File

@ -21,7 +21,7 @@
#include "xml.h"
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <stdbool.h>

2
libgamestream/sps.h
View File

@ -17,7 +17,7 @@
* along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
*/
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#define GS_SPS_BITSTREAM_FIXUP 0x01
#define GS_SPS_BASELINE_HACK 0x02

2
src/audio.h
View File

@ -19,7 +19,7 @@
#include <stdbool.h>
#include "limelight-common/Limelight.h"
#include <Limelight.h>
extern const char* audio_device;

2
src/config.h
View File

@ -17,7 +17,7 @@
* along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
*/
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <stdbool.h>

2
src/connection.h
View File

@ -17,6 +17,6 @@
* along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
*/
#include "limelight-common/Limelight.h"
#include <Limelight.h>
extern CONNECTION_LISTENER_CALLBACKS connection_callbacks;

2
src/input/cec.c
View File

@ -19,7 +19,7 @@
#ifdef HAVE_LIBCEC
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <ceccloader.h>

2
src/input/evdev.c
View File

@ -24,7 +24,7 @@
#include "mapping.h"
#include "libevdev/libevdev.h"
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <libudev.h>
#include <stdio.h>

2
src/input/sdlinput.c
View File

@ -22,7 +22,7 @@
#include "sdlinput.h"
#include "../sdl.h"
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#define ACTION_MODIFIERS (MODIFIER_SHIFT|MODIFIER_ALT|MODIFIER_CTRL)
#define QUIT_KEY SDLK_q

2
src/main.c
View File

@ -33,7 +33,7 @@
#include "input/cec.h"
#include "input/sdlinput.h"
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <stdio.h>
#include <stdlib.h>

2
src/platform.h
View File

@ -17,7 +17,7 @@
* along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
*/
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <dlfcn.h>
#include <stdlib.h>

2
src/sdl.c
View File

@ -22,7 +22,7 @@
#include "sdl.h"
#include "input/sdlinput.h"
#include "limelight-common/Limelight.h"
#include <Limelight.h>
static bool done;
static int fullscreen_flags;

2
src/video/aml.c
View File

@ -18,7 +18,7 @@
* along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
*/
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <stdio.h>
#include <stdbool.h>

2
src/video/fake.c
View File

@ -17,7 +17,7 @@
* along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
*/
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <stdio.h>

2
src/video/ffmpeg.c
View File

@ -23,7 +23,7 @@
#include "ffmpeg_vdpau.h"
#endif
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <stdlib.h>
#include <libswscale/swscale.h>

2
src/video/imx.c
View File

@ -17,7 +17,7 @@
* along with Moonlight; if not, see <http://www.gnu.org/licenses/>.
*/
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <stdlib.h>
#include <stdio.h>

2
src/video/pi.c
View File

@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "sps.h"
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <stdio.h>
#include <stdlib.h>

2
src/video/sdl.c
View File

@ -21,7 +21,7 @@
#include "../sdl.h"
#include "ffmpeg.h"
#include "limelight-common/Limelight.h"
#include <Limelight.h>
#include <SDL.h>
#include <SDL_thread.h>