Amend CMakeLists using the correct check

Vita3K · Jun 26, 2023 · fd234b6 · fd234b6
1 parent 19ce7d6
commit fd234b6
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,25 +14,14 @@ if (WIN32 AND NOT MINGW)
 		"${CMAKE_CURRENT_SOURCE_DIR}/lib/windows/x86_64/avfilter.lib"
 		"${CMAKE_CURRENT_SOURCE_DIR}/lib/windows/x86_64/swresample.lib"
 		"psapi;strmiids;uuid;oleaut32;shlwapi;ws2_32;ole32;user32;bcrypt")
-elseif (APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
+elseif (APPLE)
 	target_link_libraries(${FFMPEG_CORE_NAME} INTERFACE
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavformat.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavcodec.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libswscale.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavutil.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libavfilter.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/arm64/libswresample.a"
-		"-framework CoreServices" "-framework CoreFoundation" "-framework AudioUnit"
-		"-framework AudioToolbox" "-framework CoreAudio" "-framework CoreMedia"
-		"-framework VideoToolbox" "-framework CoreVideo" "-framework Security")
-elseif (APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
-	target_link_libraries(${FFMPEG_CORE_NAME} INTERFACE
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavformat.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavcodec.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libswscale.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavutil.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libavfilter.a"
-		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/x86_64/libswresample.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavformat.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavcodec.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libswscale.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavutil.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libavfilter.a"
+		"${CMAKE_CURRENT_SOURCE_DIR}/lib/macos/${ARCHITECTURE}/libswresample.a"
 		"-framework CoreServices" "-framework CoreFoundation" "-framework AudioUnit"
 		"-framework AudioToolbox" "-framework CoreAudio" "-framework CoreMedia"
 		"-framework VideoToolbox" "-framework CoreVideo" "-framework Security")