mirror of
https://github.com/libretro/ppsspp.git
synced 2025-02-23 18:30:46 +00:00
CMake ffmpeg: Use correct include dir (which does vary for each platform).
This commit is contained in:
parent
c103be89a2
commit
b90504a0dc
@ -37,7 +37,8 @@ endif()
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
set(LINUX ON)
|
||||
if (NOT USING_GLES2)
|
||||
set(FFMPEG ON)
|
||||
# Not working yet.
|
||||
#set(FFMPEG ON)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -497,19 +498,21 @@ endif()
|
||||
|
||||
if(FFMPEG)
|
||||
add_definitions(-DUSE_FFMPEG)
|
||||
include_directories(ffmpeg)
|
||||
set(PLATFORM_ARCH "")
|
||||
if (BLACKBERRY)
|
||||
link_directories(ffmpeg/blackberry/armv7/lib)
|
||||
set(PLATFORM_ARCH "blackberry/armv7")
|
||||
set(nativeExtraLibs ${nativeExtraLibs} iconv)
|
||||
elseif(IOS)
|
||||
link_directories(ffmpeg/ios/universal/lib)
|
||||
set(PLATFORM_ARCH "ios/universal")
|
||||
set(nativeExtraLibs ${nativeExtraLibs} iconv bz2)
|
||||
elseif(MACOSX)
|
||||
link_directories(ffmpeg/macosx/x86_64/lib)
|
||||
set(PLATFORM_ARCH "macosx/x86_64")
|
||||
elseif(LINUX)
|
||||
# Note: Only 64-bit is supported
|
||||
link_directories(ffmpeg/linux/x86_64/lib)
|
||||
set(PLATFORM_ARCH "linux/x86_64")
|
||||
endif()
|
||||
include_directories(ffmpeg/${PLATFORM_ARCH}/include)
|
||||
link_directories(ffmpeg/${PLATFORM_ARCH}/lib)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} libavformat.a libavcodec.a libswresample.a libavutil.a libswscale.a)
|
||||
endif()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user