amass/AntiClipSettings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

update ffmpeg ver.

Browse Source
This commit is contained in:
luocai 2024-10-21 17:00:48 +08:00
parent baa991dba0
commit f230e4cc8b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -18,6 +18,7 @@ if (Qt6_FOUND)
add_compile_definitions( add_compile_definitions(
BOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN10 BOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN10
) )
set(FFmpeg_ROOT ${Libraries_ROOT}/ffmpeg-7.0.2-full_build-shared)
else() else()
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>") add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>") add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
@ -25,6 +26,7 @@ else()
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(BOOST_ROOT ${Libraries_ROOT}/boost_1_83_0_msvc2022_64bit) set(BOOST_ROOT ${Libraries_ROOT}/boost_1_83_0_msvc2022_64bit)
set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include/boost-1_83) set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include/boost-1_83)
set(FFmpeg_ROOT ${Libraries_ROOT}/ffmpeg-6.1.1-full_build-shared)
endif() endif()
option(Boost_USE_STATIC_LIBS OFF) option(Boost_USE_STATIC_LIBS OFF)
@ -33,7 +35,6 @@ set(OPENSSL_INCLUDE_DIR ${OpenSSL_ROOT}/include)
set(OpenSSL_LIBRARY_DIRS ${OpenSSL_ROOT}/lib) set(OpenSSL_LIBRARY_DIRS ${OpenSSL_ROOT}/lib)
set(OpenSSL_LIBRARIES libssl libcrypto) set(OpenSSL_LIBRARIES libssl libcrypto)
set(FFmpeg_ROOT ${Libraries_ROOT}/ffmpeg-7.0.2-full_build-shared)
set(FFmpeg_INCLUDE_DIR ${FFmpeg_ROOT}/include) set(FFmpeg_INCLUDE_DIR ${FFmpeg_ROOT}/include)
set(FFmpeg_LIB_DIR ${FFmpeg_ROOT}/lib) set(FFmpeg_LIB_DIR ${FFmpeg_ROOT}/lib)
@ -102,7 +103,7 @@ set_target_properties(AntiClipSettings PROPERTIES
include(CPack) include(CPack)
include(FetchContent) include(FetchContent)
FetchContent_Declare(Kylin FetchContent_Declare(Kylin
GIT_REPOSITORY https://gitea.amass.fun/amass/Kylin.git GIT_REPOSITORY https://amass.fun/gitea/amass/Kylin.git
) )
set(KYLIN_WITH_FLUENT OFF) set(KYLIN_WITH_FLUENT OFF)
FetchContent_MakeAvailable(Kylin) FetchContent_MakeAvailable(Kylin)

6
resources/build.ps1
View File

@ -10,7 +10,9 @@ $openSSLRoot = "D:\Qt\Tools\OpenSSLv3\Win_x64"
$librariesPath = "E:\Projects\Libraries" $librariesPath = "E:\Projects\Libraries"
if (!(Test-Path $librariesPath)) { $librariesPath = "D:\Projects\Libraries" } if (!(Test-Path $librariesPath)) { $librariesPath = "D:\Projects\Libraries" }
$boostRoot = "$librariesPath\boost_1_83_0_msvc2022_64bit" $boostRoot = "$librariesPath\boost_1_83_0_msvc2022_64bit"
$ffmpegRoot = "$librariesPath\ffmpeg-7.0.2-full_build-shared"
# 6.1.1 版本支持 windows7
$ffmpegRoot = "$librariesPath\ffmpeg-6.1.1-full_build-shared"
$projectPath = Get-Location $projectPath = Get-Location
$buildPath = Join-Path -Path $projectPath -ChildPath "build" $buildPath = Join-Path -Path $projectPath -ChildPath "build"
@ -61,7 +63,7 @@ function Deploy() {
Copy-Item -Path $boostRoot\lib\boost_$boost-vc143-mt-x64-1_83.dll -Destination $deployPath Copy-Item -Path $boostRoot\lib\boost_$boost-vc143-mt-x64-1_83.dll -Destination $deployPath
} }
$ffmpegs = "avcodec-61", "avdevice-61", "avfilter-10", "avformat-61", "avutil-59", "postproc-58", "swresample-5", "swscale-8" $ffmpegs = "avcodec-60", "avdevice-60", "avfilter-9", "avformat-60", "avutil-58", "postproc-57", "swresample-4", "swscale-7"
foreach ($ffmpeg in $ffmpegs) { foreach ($ffmpeg in $ffmpegs) {
Copy-Item -Path $ffmpegRoot\bin\$ffmpeg.dll -Destination $deployPath Copy-Item -Path $ffmpegRoot\bin\$ffmpeg.dll -Destination $deployPath
} }