mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-23 13:30:02 +00:00
Clean up CMakeLists with regards to FFMPEG.
This commit is contained in:
parent
4bb9e32f03
commit
5f01acd03b
@ -5,16 +5,22 @@ project(PPSSPP)
|
||||
if(ANDROID)
|
||||
if(ARMEABI OR ARMEABI_V7A)
|
||||
set(ARM ON)
|
||||
set(FFMPEG ON)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(BLACKBERRY)
|
||||
set(CMAKE_SYSTEM_NAME "QNX")
|
||||
endif()
|
||||
|
||||
if (IOS OR BLACKBERRY)
|
||||
set(ARM ON)
|
||||
set(FFMPEG ON)
|
||||
endif()
|
||||
|
||||
if (MAEMO)
|
||||
set(ARM ON)
|
||||
#Maemo's gcc-4.7.2 is strickt
|
||||
#Maemo's gcc-4.7.2 is strict
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
|
||||
endif()
|
||||
|
||||
@ -28,8 +34,16 @@ else() # Assume x86
|
||||
set(X86 ON)
|
||||
endif()
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
set(LINUX ON)
|
||||
if (NOT USING_GLES2)
|
||||
set(FFMPEG ON)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
set(MACOSX ON)
|
||||
set(FFMPEG ON)
|
||||
endif()
|
||||
|
||||
if(ANDROID OR BLACKBERRY OR IOS OR PANDORA OR MAEMO OR MACOSX)
|
||||
@ -49,6 +63,7 @@ option(MAEMO "Set to ON if targeting an Maemo (N900) device" ${MAEMO})
|
||||
option(IOS "Set to ON if targeting an iOS device" ${IOS})
|
||||
option(USING_GLES2 "Set to ON if target device uses OpenGL ES 2.0" ${USING_GLES2})
|
||||
option(USING_QT_UI "Set to ON if you wish to use the Qt frontend wrapper" ${USING_QT_UI})
|
||||
option(FFMPEG "Set to OFF to disable FFMPEG usage" ${FFMPEG})
|
||||
option(HEADLESS "Set to OFF to not generate the PPSSPPHeadless target" ${HEADLESS})
|
||||
|
||||
if(ANDROID)
|
||||
@ -92,7 +107,6 @@ endif()
|
||||
include_directories("${CMAKE_SOURCE_DIR}")
|
||||
|
||||
if(BLACKBERRY)
|
||||
set(CMAKE_SYSTEM_NAME "QNX")
|
||||
add_definitions(-DBLACKBERRY)
|
||||
if(BLACKBERRY VERSION_GREATER 10)
|
||||
add_definitions(-DBLACKBERRY10)
|
||||
@ -454,11 +468,6 @@ elseif(IOS)
|
||||
ios/iCade/iCadeReaderView.m
|
||||
ios/iCade/iCadeState.h)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} "-framework Foundation -framework AudioToolbox -framework CoreGraphics -framework QuartzCore -framework OpenGLES -framework UIKit -framework GLKit -framework OpenAL")
|
||||
# FFMPEG
|
||||
add_definitions(-DUSE_FFMPEG)
|
||||
include_directories(ffmpeg/ios/universal/include)
|
||||
link_directories(ffmpeg/ios/universal/lib)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} iconv bz2 libavformat.a libavcodec.a libswresample.a libavutil.a libswscale.a)
|
||||
set(TargetBin PPSSPP)
|
||||
elseif(USING_QT_UI)
|
||||
# Currently unused
|
||||
@ -471,18 +480,8 @@ elseif(USING_QT_UI)
|
||||
elseif(BLACKBERRY)
|
||||
set(nativeExtra ${nativeExtra} native/base/BlackberryMain.cpp native/base/BlackberryDisplay.cpp)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} OpenAL bps screen socket EGL)
|
||||
# FFMPEG
|
||||
add_definitions(-DUSE_FFMPEG)
|
||||
include_directories(ffmpeg/blackberry/armv7/include)
|
||||
link_directories(ffmpeg/blackberry/armv7/lib)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} iconv libavformat.a libavcodec.a libswresample.a libavutil.a libswscale.a)
|
||||
set(TargetBin PPSSPPBlackberry)
|
||||
elseif(SDL_FOUND)
|
||||
if(MACOSX)
|
||||
include_directories(ffmpeg/macosx/x86_64/include)
|
||||
link_directories(ffmpeg/macosx/x86_64/lib)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} libavformat.a libavcodec.a libswresample.a libavutil.a libswscale.a)
|
||||
endif()
|
||||
set(TargetBin PPSSPPSDL)
|
||||
# Require SDL
|
||||
include_directories(${SDL_INCLUDE_DIR})
|
||||
@ -494,14 +493,29 @@ elseif(SDL_FOUND)
|
||||
elseif(PANDORA OR MAEMO)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} pthread EGL X11)
|
||||
endif()
|
||||
# FFMPEG
|
||||
add_definitions(-DUSE_FFMPEG)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} avformat avcodec swresample swscale)
|
||||
set(TargetBin PPSSPPSDL)
|
||||
else()
|
||||
message(FATAL_ERROR "Could not find SDL. Failing.")
|
||||
endif()
|
||||
|
||||
if(FFMPEG)
|
||||
add_definitions(-DUSE_FFMPEG)
|
||||
include_directories(ffmpeg)
|
||||
if (BLACKBERRY)
|
||||
link_directories(ffmpeg/blackberry/armv7/lib)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} iconv)
|
||||
elseif(IOS)
|
||||
link_directories(ffmpeg/ios/universal/lib)
|
||||
set(nativeExtraLibs ${nativeExtraLibs} iconv bz2)
|
||||
elseif(MACOSX)
|
||||
link_directories(ffmpeg/macosx/x86_64/lib)
|
||||
elseif(LINUX)
|
||||
# Note: Only 64-bit is supported
|
||||
link_directories(ffmpeg/linux/x86_64/lib)
|
||||
endif()
|
||||
set(nativeExtraLibs ${nativeExtraLibs} libavformat.a libavcodec.a libswresample.a libavutil.a libswscale.a)
|
||||
endif()
|
||||
|
||||
if(X86)
|
||||
set(nativeExtra ${nativeExtra}
|
||||
native/base/backtrace.cpp
|
||||
@ -722,7 +736,7 @@ endif()
|
||||
|
||||
# atrac3plus.cpp used dl* functions on non-win32 platforms
|
||||
# Core needs to be linked with dl on these platforms
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
if(LINUX)
|
||||
set(CoreExtraLibs ${CoreExtraLibs} ${CMAKE_DL_LIBS})
|
||||
endif()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user