mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-31 08:29:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix linker issues with ffmpeg

Browse Source
This commit is contained in:
Malin E
2022-09-07 16:09:43 +02:00
parent 66b32c2b3d
commit 3d5185ff5a
4 changed files with 8788 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/globebrowsing/CMakeLists.txt
View File

@@ -150,32 +150,32 @@ target_precompile_headers(${globebrowsing_module} PRIVATE
# Ffmpeg
if(WIN32)
add_library(Avcodec SHARED IMPORTED)
set_target_properties(Avcodec PROPERTIES
add_library(avcodec SHARED IMPORTED)
set_target_properties(avcodec PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/lib/avcodec-59.dll"
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/lib/avcodec.lib"
IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/lib/avcodec.lib"
)
target_include_directories(Avcodec INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/include")
target_link_libraries(openspace-module-globebrowsing INTERFACE Avcodec)
target_include_directories(avcodec INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/include")
target_link_libraries(openspace-module-globebrowsing PUBLIC avcodec)
add_library(Avformat SHARED IMPORTED)
set_target_properties(Avformat PROPERTIES
add_library(avformat SHARED IMPORTED)
set_target_properties(avformat PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/lib/avformat-59.dll"
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/lib/avformat.lib"
IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/lib/avformat.lib"
)
target_include_directories(Avformat INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/include")
target_link_libraries(openspace-module-globebrowsing INTERFACE Avformat)
target_include_directories(avformat INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/include")
target_link_libraries(openspace-module-globebrowsing PUBLIC avformat)
add_library(Avutil SHARED IMPORTED)
set_target_properties(Avutil PROPERTIES
add_library(avutil SHARED IMPORTED)
set_target_properties(avutil PROPERTIES
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/lib/avutil-57.dll"
IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/lib/avutil.lib"
IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/lib/avutil.lib"
)
target_include_directories(Avutil INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/include")
target_link_libraries(openspace-module-globebrowsing INTERFACE Avutil)
target_include_directories(avutil INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ext/ffmpeg/include")
target_link_libraries(openspace-module-globebrowsing PUBLIC avutil)
else(WIN32)
find_package(FFMPEG REQUIRED)

8762
modules/globebrowsing/ext/ffmpeg/lib/avutil.txt Normal file
View File

File diff suppressed because it is too large Load Diff

3
modules/globebrowsing/src/tileprovider/ffmpegtileprovider.cpp
View File

@@ -245,6 +245,9 @@ int FfmpegTileProvider::maxLevel() {
return 1337; // unlimited
}
void FfmpegTileProvider::reset() {}
float FfmpegTileProvider::noDataValueAsFloat() {
return std::numeric_limits<float>::min();
}

11
modules/globebrowsing/src/tileprovider/ffmpegtileprovider.h
View File

@@ -30,9 +30,14 @@
#include <ghoul/glm.h>
// FFMPEG
#include <avcodec> // avcodec_alloc_context3
#include <avformat> // avformat_open_input, AVFormatContext
#include <imgutils.h> // av_image_get_buffer_size
extern "C" {
#include <libavcodec/avcodec.h> // avcodec_alloc_context3
#include <libavformat/avformat.h> // avformat_open_input, AVFormatContext
#include <libavutil/imgutils.h> // av_image_get_buffer_size
#include <libavutil/frame.h>
#include <libavutil/mem.h>
}
namespace openspace { struct Documentation; }