Skip to content

Commit a680fd4

Browse files
shinra-electricAniLeo
authored andcommitted
Amend CMakeLists using the correct check
1 parent 1b0951b commit a680fd4

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

CMakeLists.txt

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,14 @@ if (WIN32 AND NOT MINGW)
1414
"${CMAKE_CURRENT_SOURCE_DIR}/lib/windows/x86_64/avfilter.lib"
1515
"${CMAKE_CURRENT_SOURCE_DIR}/lib/windows/x86_64/swresample.lib"
1616
"psapi;strmiids;uuid;oleaut32;shlwapi;ws2_32;ole32;user32;bcrypt")
17-
elseif (APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
17+
elseif (APPLE)
1818
target_link_libraries(${FFMPEG_CORE_NAME} INTERFACE
19-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavformat.a"
20-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavcodec.a"
21-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libswscale.a"
22-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavutil.a"
23-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavfilter.a"
24-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libswresample.a"
25-
"-framework CoreServices" "-framework CoreFoundation" "-framework AudioUnit"
26-
"-framework AudioToolbox" "-framework CoreAudio" "-framework CoreMedia"
27-
"-framework VideoToolbox" "-framework CoreVideo" "-framework Security")
28-
elseif (APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
29-
target_link_libraries(${FFMPEG_CORE_NAME} INTERFACE
30-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavformat.a"
31-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavcodec.a"
32-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libswscale.a"
33-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavutil.a"
34-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavfilter.a"
35-
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libswresample.a"
19+
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavformat.a"
20+
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavcodec.a"
21+
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libswscale.a"
22+
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavutil.a"
23+
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavfilter.a"
24+
"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libswresample.a"
3625
"-framework CoreServices" "-framework CoreFoundation" "-framework AudioUnit"
3726
"-framework AudioToolbox" "-framework CoreAudio" "-framework CoreMedia"
3827
"-framework VideoToolbox" "-framework CoreVideo" "-framework Security")

0 commit comments

Comments
 (0)