From f8a1d62a7b5b557be6ddb0c24f610dd9bee86299 Mon Sep 17 00:00:00 2001 From: Iwan Timmer Date: Tue, 26 May 2015 16:38:11 +0200 Subject: [PATCH] Move third party code to own directory --- .gitmodules | 2 +- CMakeLists.txt | 12 ++++++------ {h264bitstream => third_party/h264bitstream}/LICENSE | 0 {h264bitstream => third_party/h264bitstream}/bs.h | 0 .../h264bitstream}/h264_nal.c | 0 .../h264bitstream}/h264_sei.c | 0 .../h264bitstream}/h264_sei.h | 0 .../h264bitstream}/h264_stream.c | 0 .../h264bitstream}/h264_stream.h | 0 {ilclient => third_party/ilclient}/ilclient.c | 0 {ilclient => third_party/ilclient}/ilclient.h | 0 {ilclient => third_party/ilclient}/ilcore.c | 0 common => third_party/moonlight-common-c | 0 13 files changed, 7 insertions(+), 7 deletions(-) rename {h264bitstream => third_party/h264bitstream}/LICENSE (100%) rename {h264bitstream => third_party/h264bitstream}/bs.h (100%) rename {h264bitstream => third_party/h264bitstream}/h264_nal.c (100%) rename {h264bitstream => third_party/h264bitstream}/h264_sei.c (100%) rename {h264bitstream => third_party/h264bitstream}/h264_sei.h (100%) rename {h264bitstream => third_party/h264bitstream}/h264_stream.c (100%) rename {h264bitstream => third_party/h264bitstream}/h264_stream.h (100%) rename {ilclient => third_party/ilclient}/ilclient.c (100%) rename {ilclient => third_party/ilclient}/ilclient.h (100%) rename {ilclient => third_party/ilclient}/ilcore.c (100%) rename common => third_party/moonlight-common-c (100%) diff --git a/.gitmodules b/.gitmodules index 892da34..59e0106 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "common"] - path = common + path = third_party/moonlight-common-c url = https://github.com/irtimmer/moonlight-common-c.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 877ef0f..0a8ef92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,10 +6,10 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") aux_source_directory(./src SRC_LIST) list(APPEND SRC_LIST ./src/video/fake.c) -aux_source_directory(./common/limelight-common SRC_LIST) -aux_source_directory(./common/limelight-common/OpenAES SRC_LIST) +aux_source_directory(./third_party/moonlight-common-c/limelight-common SRC_LIST) +aux_source_directory(./third_party/moonlight-common-c/limelight-common/OpenAES SRC_LIST) -include_directories(./common) +include_directories(./third_party/moonlight-common-c) set(MOONLIGHT_DEFINITIONS) @@ -28,8 +28,8 @@ pkg_check_modules(AVAHI REQUIRED avahi-client) pkg_check_modules(UDEV REQUIRED libudev) if(BROADCOM_FOUND) - aux_source_directory(./ilclient SRC_LIST) - aux_source_directory(./h264bitstream SRC_LIST) + aux_source_directory(./third_party/ilclient SRC_LIST) + aux_source_directory(./third_party/h264bitstream SRC_LIST) list(APPEND SRC_LIST ./src/video/omx.c) list(APPEND MOONLIGHT_DEFINITIONS HAVE_OMX) endif() @@ -54,7 +54,7 @@ if(FREESCALE_FOUND) endif() set_property(TARGET moonlight PROPERTY COMPILE_DEFINITIONS ${MOONLIGHT_DEFINITIONS}) -include_directories(./moonlight-common-c ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${AVAHI_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS}) +include_directories(./third_party/moonlight-common-c ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${AVAHI_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS}) target_link_libraries (moonlight PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${AVAHI_LIBRARIES} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS}) include(${CMAKE_ROOT}/Modules/GNUInstallDirs.cmake) diff --git a/h264bitstream/LICENSE b/third_party/h264bitstream/LICENSE similarity index 100% rename from h264bitstream/LICENSE rename to third_party/h264bitstream/LICENSE diff --git a/h264bitstream/bs.h b/third_party/h264bitstream/bs.h similarity index 100% rename from h264bitstream/bs.h rename to third_party/h264bitstream/bs.h diff --git a/h264bitstream/h264_nal.c b/third_party/h264bitstream/h264_nal.c similarity index 100% rename from h264bitstream/h264_nal.c rename to third_party/h264bitstream/h264_nal.c diff --git a/h264bitstream/h264_sei.c b/third_party/h264bitstream/h264_sei.c similarity index 100% rename from h264bitstream/h264_sei.c rename to third_party/h264bitstream/h264_sei.c diff --git a/h264bitstream/h264_sei.h b/third_party/h264bitstream/h264_sei.h similarity index 100% rename from h264bitstream/h264_sei.h rename to third_party/h264bitstream/h264_sei.h diff --git a/h264bitstream/h264_stream.c b/third_party/h264bitstream/h264_stream.c similarity index 100% rename from h264bitstream/h264_stream.c rename to third_party/h264bitstream/h264_stream.c diff --git a/h264bitstream/h264_stream.h b/third_party/h264bitstream/h264_stream.h similarity index 100% rename from h264bitstream/h264_stream.h rename to third_party/h264bitstream/h264_stream.h diff --git a/ilclient/ilclient.c b/third_party/ilclient/ilclient.c similarity index 100% rename from ilclient/ilclient.c rename to third_party/ilclient/ilclient.c diff --git a/ilclient/ilclient.h b/third_party/ilclient/ilclient.h similarity index 100% rename from ilclient/ilclient.h rename to third_party/ilclient/ilclient.h diff --git a/ilclient/ilcore.c b/third_party/ilclient/ilcore.c similarity index 100% rename from ilclient/ilcore.c rename to third_party/ilclient/ilcore.c diff --git a/common b/third_party/moonlight-common-c similarity index 100% rename from common rename to third_party/moonlight-common-c