From 7ed58da3aed873dfc144beea6bf59cfc45a29aad Mon Sep 17 00:00:00 2001 From: Marcus Asteborg Date: Fri, 3 Aug 2018 00:17:36 -0700 Subject: [PATCH] [Live555] Add missing symbols due to missing C files and copy paste bug (#4002) * Add missing symbols due to missing C files and copy paste bug * [live555] Bump control version to include package change --- ports/live555/CMakeLists.txt | 12 ++++++------ ports/live555/CONTROL | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/live555/CMakeLists.txt b/ports/live555/CMakeLists.txt index a41d2c791b..8be171fc2b 100644 --- a/ports/live555/CMakeLists.txt +++ b/ports/live555/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(live555 CXX) +project(live555 C CXX) include_directories( BasicUsageEnvironment/include @@ -8,17 +8,17 @@ include_directories( UsageEnvironment/include ) -file(GLOB BASIC_USAGE_ENVIRONMENT_SRCS BasicUsageEnvironment/*.cpp) +file(GLOB BASIC_USAGE_ENVIRONMENT_SRCS BasicUsageEnvironment/*.c BasicUsageEnvironment/*.cpp) add_library(BasicUsageEnvironment ${BASIC_USAGE_ENVIRONMENT_SRCS}) -file(GLOB GROUPSOCK_SRCS groupsock/*.cpp) +file(GLOB GROUPSOCK_SRCS groupsock/*.c groupsock/*.cpp) add_library(groupsock ${GROUPSOCK_SRCS}) -file(GLOB LIVEMEDIA_SRCS liveMedia/*.cpp) +file(GLOB LIVEMEDIA_SRCS liveMedia/*.c liveMedia/*.cpp) add_library(liveMedia ${LIVEMEDIA_SRCS}) -file(GLOB USAGE_ENVIRONMENT_SRCS UsageEnvironment/*.cpp) -add_library(UsageEnvironment ${LIVEMEDIA_SRCS}) +file(GLOB USAGE_ENVIRONMENT_SRCS UsageEnvironment/*.c UsageEnvironment/*.cpp) +add_library(UsageEnvironment ${USAGE_ENVIRONMENT_SRCS}) install(TARGETS groupsock BasicUsageEnvironment liveMedia UsageEnvironment RUNTIME DESTINATION bin diff --git a/ports/live555/CONTROL b/ports/live555/CONTROL index 276a554b55..45b39704e7 100644 --- a/ports/live555/CONTROL +++ b/ports/live555/CONTROL @@ -1,3 +1,3 @@ Source: live555 -Version: 2018.07.07 +Version: 2018.07.07-1 Description: A complete RTSP server application