Skip to content

Commit 1225181

Browse files
committed
build: don't link directly against ffmpeg
1 parent 888a785 commit 1225181

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

native/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ target_include_directories(${PROJECT_NAME} PRIVATE "src/cpp/")
5151

5252
message(STATUS "JAVA_HOME: ${JAVA_HOME}")
5353
target_include_directories(${PROJECT_NAME} PUBLIC "${JAVA_HOME}/include")
54-
if (NOT USE_SYSTEM_FFMPEG)
55-
target_link_libraries(${PROJECT_NAME} PUBLIC -Wl,--push-state,--whole-archive,--allow-multiple-definition ffmpeg -Wl,--pop-state)
56-
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND objcopy --localize-hidden --strip-all --strip-unneeded $<TARGET_FILE:${PROJECT_NAME}>)
57-
endif ()
54+
#if (NOT USE_SYSTEM_FFMPEG)
55+
# target_link_libraries(${PROJECT_NAME} PUBLIC -Wl,--push-state,--whole-archive,--allow-multiple-definition ffmpeg -Wl,--pop-state)
56+
# add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND objcopy --localize-hidden --strip-all --strip-unneeded $<TARGET_FILE:${PROJECT_NAME}>)
57+
#endif ()
5858

5959
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
6060
target_compile_definitions(${PROJECT_NAME} PRIVATE -D_LINUX)
@@ -63,10 +63,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
6363
pkg_check_modules(MPV REQUIRED IMPORTED_TARGET mpv)
6464
target_link_libraries(${PROJECT_NAME} PUBLIC PkgConfig::GL PkgConfig::MPV)
6565
target_include_directories(${PROJECT_NAME} PUBLIC "${JAVA_HOME}/include/linux")
66-
if (USE_SYSTEM_FFMPEG)
67-
pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET libavcodec libavformat libavutil libswscale libavfilter)
68-
target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::FFMPEG)
69-
endif ()
66+
# if (USE_SYSTEM_FFMPEG)
67+
# pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET libavcodec libavformat libavutil libswscale libavfilter)
68+
# target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::FFMPEG)
69+
# endif ()
7070
elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
7171
target_compile_definitions(${PROJECT_NAME} PRIVATE -D_WINDOWS)
7272
target_link_libraries(${PROJECT_NAME} PUBLIC opengl32 dxgi d3d11 d3dcompiler)

native/src/cpp/helper/errors.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@
88
#include <GL/gl.h>
99
#include <iostream>
1010

11-
extern "C" {
12-
#include <libavutil/error.h>
13-
}
14-
15-
std::string avErrorString(const int error) {
16-
char errorString[AV_ERROR_MAX_STRING_SIZE];
17-
av_strerror(error, errorString, AV_ERROR_MAX_STRING_SIZE);
18-
return {errorString};
19-
}
20-
2111
jobject boxedLong(JNIEnv *env, const long value) {
2212
const auto boxedClass = env->FindClass("java/lang/Long");
2313
const auto constructor = env->GetMethodID(boxedClass, "<init>", "(J)V");

0 commit comments

Comments
 (0)