Made av libs private to liblmsav

This commit is contained in:
emeric
2020-08-21 10:13:10 +02:00
parent bc87e16d08
commit 9fbbca97a4
3 changed files with 16 additions and 12 deletions
+6 -4
View File
@@ -6,16 +6,15 @@ add_library(lmsav SHARED
impl/AvTypes.cpp impl/AvTypes.cpp
) )
# TODO make av libs private
target_include_directories(lmsav INTERFACE target_include_directories(lmsav INTERFACE
include include
${AVCODEC_INCLUDE_DIR}
${AVFORMAT_INCLUDE_DIR}
${AVUTIL_INCLUDE_DIR}
) )
target_include_directories(lmsav PRIVATE target_include_directories(lmsav PRIVATE
include/ include/
${AVCODEC_INCLUDE_DIR}
${AVFORMAT_INCLUDE_DIR}
${AVUTIL_INCLUDE_DIR}
) )
target_link_libraries(lmsav PUBLIC target_link_libraries(lmsav PUBLIC
@@ -24,6 +23,9 @@ target_link_libraries(lmsav PUBLIC
avutil avutil
std::filesystem std::filesystem
wt wt
)
target_link_libraries(lmsav PRIVATE
${AVFORMAT_LIBRARY} ${AVFORMAT_LIBRARY}
${AVUTIL_LIBRARY} ${AVUTIL_LIBRARY}
) )
+8
View File
@@ -19,6 +19,14 @@
#include "av/AvInfo.hpp" #include "av/AvInfo.hpp"
extern "C"
{
#define __STDC_CONSTANT_MACROS
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavutil/error.h>
}
#include <array> #include <array>
#include "utils/Logger.hpp" #include "utils/Logger.hpp"
+2 -8
View File
@@ -21,14 +21,6 @@
#pragma once #pragma once
extern "C"
{
#define __STDC_CONSTANT_MACROS
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavutil/error.h>
}
#include <chrono> #include <chrono>
#include <filesystem> #include <filesystem>
#include <map> #include <map>
@@ -38,6 +30,8 @@ extern "C"
#include "AvTypes.hpp" #include "AvTypes.hpp"
struct AVFormatContext;
namespace Av namespace Av
{ {