archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 14:31:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmake: remove unused link to ffmpeg libswresample

Browse source
This commit is contained in:
scribam 2017-11-22 21:56:54 +01:00 • committed by Ani
parent d05071221e
commit 78101a9e57
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/CMakeLists.txt
View file

@ -390,7 +390,7 @@ if(WIN32)
else() else()
target_link_libraries(rpcs3 dxgi.lib d2d1.lib dwrite.lib) target_link_libraries(rpcs3 dxgi.lib d2d1.lib dwrite.lib)
endif() endif()
target_link_libraries(rpcs3 avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib png16_static ${OPENAL_LIBRARY} ${ADDITIONAL_LIBS}) target_link_libraries(rpcs3 avformat.lib avcodec.lib avutil.lib swscale.lib png16_static ${OPENAL_LIBRARY} ${ADDITIONAL_LIBS})
else() else()
target_link_libraries(rpcs3 ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) target_link_libraries(rpcs3 ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
if(APPLE) if(APPLE)
@ -406,9 +406,9 @@ else()
target_link_libraries(rpcs3 ${CMAKE_DL_LIBS} -lpthread ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS}) target_link_libraries(rpcs3 ${CMAKE_DL_LIBS} -lpthread ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS})
if (USE_SYSTEM_FFMPEG) if (USE_SYSTEM_FFMPEG)
link_libraries(${FFMPEG_LIBRARY_DIR}) link_libraries(${FFMPEG_LIBRARY_DIR})
target_link_libraries(rpcs3 libavformat.so libavcodec.so libavutil.so libswresample.so libswscale.so) target_link_libraries(rpcs3 libavformat.so libavcodec.so libavutil.so libswscale.so)
else() else()
target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a) target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswscale.a)
endif() endif()
if (USE_SYSTEM_LIBPNG) if (USE_SYSTEM_LIBPNG)
target_link_libraries(rpcs3 ${PNG_LIBRARIES}) target_link_libraries(rpcs3 ${PNG_LIBRARIES})

1
rpcs3/Emu/Cell/Modules/cellAdec.cpp
View file

@ -8,7 +8,6 @@ extern "C"
{ {
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libswresample/swresample.h"
} }
#include "cellPamf.h" #include "cellPamf.h"