From ef1ae20b734977ce071ba401e6720bb34f185b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=AE=E7=94=9F=E8=8B=A5=E6=A2=A6?= <1070753498@qq.com> Date: Thu, 6 Jun 2024 09:28:56 +0800 Subject: [PATCH] =?UTF-8?q?[Qt-Ffmpeg:=20=E6=9B=B4=E6=96=B0mpv=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E5=99=A8=E5=BA=93=E7=9A=84=E5=BC=95=E7=94=A8=E4=B8=BA?= =?UTF-8?q?qmpv]=EF=BC=9A=E5=AF=B9Qt-Ffmpeg=E9=A1=B9=E7=9B=AE=E7=9A=84CMak?= =?UTF-8?q?eLists.txt=E5=92=8Cpro=E6=96=87=E4=BB=B6=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E4=BA=86=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=B0=86mpv=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E5=99=A8=E5=BA=93=E7=9A=84=E5=BC=95=E7=94=A8=E4=BB=8E?= =?UTF-8?q?`custommpv`=E6=9B=B4=E6=96=B0=E4=B8=BA`qmpv`=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在`examples/mpvplayer/CMakeLists.txt`中，将`target_compile_definitions`中的`custommpv`更改为`qmpv`，并在`target_link_libraries`中作出了相应的更改。 - 对`examples/mpvplayer/mpvplayer.pro`文件进行了修改，将`LIBS`中的`custommpv`更改为`qmpv`。 - 在`src/mpv/CMakeLists.txt`文件中，将`add_custom_library(custommpv ...)`更改为`add_custom_library(qmpv ...)`，并相应更新了`target_link_libraries`中的库名称。 - 对`src/mpv/mpv.pro`文件进行了更新，将`TARGET`的值从`custommpv`更改为`qmpv`。 --- examples/mpvplayer/CMakeLists.txt | 7 +++---- examples/mpvplayer/mpvplayer.pro | 2 +- src/mpv/CMakeLists.txt | 19 +++++++++---------- src/mpv/mpv.pro | 2 +- src/utils/CMakeLists.txt | 2 +- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/examples/mpvplayer/CMakeLists.txt b/examples/mpvplayer/CMakeLists.txt index 1c0ee4b..7694855 100644 --- a/examples/mpvplayer/CMakeLists.txt +++ b/examples/mpvplayer/CMakeLists.txt @@ -28,7 +28,7 @@ qt_add_executable(MpvPlayer MANUAL_FINALIZATION ${PROJECT_SOURCES}) target_compile_definitions(MpvPlayer PRIVATE "MPV_ON") target_link_libraries( MpvPlayer - PRIVATE custommpv + PRIVATE qmpv thirdparty dump utils @@ -41,10 +41,9 @@ if(CMAKE_HOST_WIN32) file(COPY C:\\3rd\\x64\\mpv\\libmpv-2.dll DESTINATION ${EXECUTABLE_OUTPUT_PATH}/) elseif(CMAKE_HOST_APPLE) - target_link_directories(MpvPlayer PRIVATE /usr/lib) - target_link_directories(MpvPlayer PRIVATE /usr/local/lib) + target_link_directories(MpvPlayer PRIVATE "/usr/local/lib") target_link_libraries(MpvPlayer PRIVATE mpv) -elseif(CMAKE_HOST_UNIX) +elseif(CMAKE_HOST_LINUX) target_link_libraries(MpvPlayer PRIVATE mpv) endif() diff --git a/examples/mpvplayer/mpvplayer.pro b/examples/mpvplayer/mpvplayer.pro index d3a009a..27a537d 100644 --- a/examples/mpvplayer/mpvplayer.pro +++ b/examples/mpvplayer/mpvplayer.pro @@ -9,7 +9,7 @@ TARGET = MpvPlayer DEFINES += MPV_ON LIBS += \ - -l$$replaceLibName(custommpv) \ + -l$$replaceLibName(qmpv) \ -l$$replaceLibName(thirdparty) \ -l$$replaceLibName(dump) \ -l$$replaceLibName(utils) diff --git a/src/mpv/CMakeLists.txt b/src/mpv/CMakeLists.txt index b81c139..e8f667e 100644 --- a/src/mpv/CMakeLists.txt +++ b/src/mpv/CMakeLists.txt @@ -12,21 +12,20 @@ set(PROJECT_SOURCES previewwidget.hpp qthelper.hpp) -add_custom_library(custommpv ${PROJECT_SOURCES} ${SOURCES}) -target_link_libraries(custommpv PRIVATE Qt6::Widgets Qt6::OpenGLWidgets) +add_custom_library(qmpv ${PROJECT_SOURCES} ${SOURCES}) +target_link_libraries(qmpv PRIVATE Qt6::Widgets Qt6::OpenGLWidgets) if(CMAKE_HOST_WIN32) - target_include_directories(custommpv PRIVATE "C:\\3rd\\x64\\mpv\\include") - target_link_libraries(custommpv PRIVATE C:\\3rd\\x64\\mpv\\libmpv.dll.a) + target_include_directories(qmpv PRIVATE "C:\\3rd\\x64\\mpv\\include") + target_link_libraries(qmpv PRIVATE C:\\3rd\\x64\\mpv\\libmpv.dll.a) elseif(CMAKE_HOST_APPLE) - target_include_directories(custommpv PRIVATE "/usr/local/include") - target_link_directories(custommpv PRIVATE /usr/lib) - target_link_directories(custommpv PRIVATE /usr/local/lib) - target_link_libraries(custommpv PRIVATE mpv) + target_include_directories(qmpv PRIVATE "/usr/local/include") + target_link_directories(qmpv PRIVATE "/usr/local/lib") + target_link_libraries(qmpv PRIVATE mpv) elseif(CMAKE_HOST_LINUX) - target_link_libraries(custommpv PRIVATE mpv) + target_link_libraries(qmpv PRIVATE mpv) endif() if(CMAKE_HOST_WIN32) - target_compile_definitions(custommpv PRIVATE "MPV_LIBRARY") + target_compile_definitions(qmpv PRIVATE "MPV_LIBRARY") endif() diff --git a/src/mpv/mpv.pro b/src/mpv/mpv.pro index 8648f52..bfea717 100644 --- a/src/mpv/mpv.pro +++ b/src/mpv/mpv.pro @@ -4,7 +4,7 @@ include(mpv.pri) QT += core gui network widgets openglwidgets DEFINES += MPV_LIBRARY -TARGET = $$replaceLibName(custommpv) +TARGET = $$replaceLibName(qmpv) SOURCES += \ mediainfo.cc \ diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 3291132..e96978a 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -18,7 +18,7 @@ set(PROJECT_SOURCES utils.h utilstr.h) -add_custom_library(utils ${PROJECT_SOURCES} ${SOURCES}) +add_custom_library(utils ${PROJECT_SOURCES}) target_link_libraries(utils PRIVATE Qt6::Widgets Qt6::Core5Compat) if(CMAKE_HOST_WIN32)