diff --git a/cmake/3rdParty/Findlibav.cmake b/cmake/3rdParty/Findlibav.cmake deleted file mode 100644 index f14a4cfe50..0000000000 --- a/cmake/3rdParty/Findlibav.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# -# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -# its licensors. -# -# For complete copyright and license terms please see the LICENSE at the root of this -# distribution (the "License"). All use of this software is governed by the License, -# or, if provided, by the license below or the license accompanying this file. Do not -# remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# - -ly_add_external_target( - NAME libav - VERSION 11.7 - INCLUDE_DIRECTORIES - usr/include -) diff --git a/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake index 546cd9811f..57dc8ed604 100644 --- a/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake +++ b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake @@ -13,6 +13,5 @@ set(FILES BuiltInPackages_windows.cmake dyad_windows.cmake FbxSdk_windows.cmake - libav_windows.cmake Wwise_windows.cmake ) diff --git a/cmake/3rdParty/Platform/Windows/libav_windows.cmake b/cmake/3rdParty/Platform/Windows/libav_windows.cmake deleted file mode 100644 index f41cde4089..0000000000 --- a/cmake/3rdParty/Platform/Windows/libav_windows.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# -# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -# its licensors. -# -# For complete copyright and license terms please see the LICENSE at the root of this -# distribution (the "License"). All use of this software is governed by the License, -# or, if provided, by the license below or the license accompanying this file. Do not -# remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# - -set(LIBAV_LIB_PATH ${BASE_PATH}/usr/bin/) -set(LIBAV_LIBS - avcodec - avdevice - avfilter - avformat - avresample - avutil - swscale -) - -list(TRANSFORM LIBAV_LIBS PREPEND ${LIBAV_LIB_PATH}${CMAKE_STATIC_LIBRARY_PREFIX}) -list(TRANSFORM LIBAV_LIBS APPEND "${CMAKE_STATIC_LIBRARY_SUFFIX}") - - -set(LIBAV_SHARED - avcodec-56 - avdevice-55 - avfilter-5 - avformat-56 - avresample-2 - avutil-54 - libogg-0 - libopus-0 - libvo-aacenc-0 - libvorbis-0 - libvorbisenc-2 - swscale-3 - zlib1 -) - -list(TRANSFORM LIBAV_SHARED PREPEND ${LIBAV_LIB_PATH}${CMAKE_SHARED_LIBRARY_PREFIX}) -list(TRANSFORM LIBAV_SHARED APPEND "${CMAKE_SHARED_LIBRARY_SUFFIX}") -list(JOIN LIBAV_SHARED ";" LIBAV_SHARED_STRING) -set(LIBAV_RUNTIME_DEPENDENCIES ${LIBAV_SHARED_STRING}) diff --git a/cmake/3rdParty/cmake_files.cmake b/cmake/3rdParty/cmake_files.cmake index d37fcba840..a4737b7020 100644 --- a/cmake/3rdParty/cmake_files.cmake +++ b/cmake/3rdParty/cmake_files.cmake @@ -14,7 +14,6 @@ set(FILES FindClang.cmake Finddyad.cmake FindFbxSdk.cmake - Findlibav.cmake FindOpenGLInterface.cmake FindRadTelemetry.cmake FindVkValidation.cmake diff --git a/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json b/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json index 97deb11ea6..a9ed45daca 100644 --- a/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json +++ b/scripts/build/package/Platform/3rdParty/package_filelists/3rdParty.json @@ -10,7 +10,6 @@ "etc2comp/2017_04_24-az.2/**": "#include", "expat/2.1.0-pkg.3/**": "#include", "FbxSdk/2016.1.2-az.1/**": "#include", - "libav/11.7/**": "#include", "OpenSSL/1.1.1b-noasm-az/**": "#include", "Qt/5.15.1.2-az/**": "#include", "RadTelemetry/3.5.0.17/**": "#include",