Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix PPSSPPSDL on MacOSX, link ffmpeg.

Browse Source
This commit is contained in:
Henrik Rydgård 2013-06-15 14:50:47 +02:00
parent 856fe3ec14
commit c128f164ed
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -28,7 +28,11 @@ else() # Assume x86
set(X86 ON)
endif()
if(ANDROID OR BLACKBERRY OR IOS OR PANDORA OR MAEMO)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(MACOSX ON)
endif()
if(ANDROID OR BLACKBERRY OR IOS OR PANDORA OR MAEMO OR MACOSX)
set(HEADLESS OFF)
elseif(NOT DEFINED HEADLESS)
set(HEADLESS ON)
@ -472,6 +476,12 @@ elseif(BLACKBERRY)
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})
set(nativeExtra ${nativeExtra} native/base/PCMain.cpp)

2
ffmpeg

@ -1 +1 @@
Subproject commit 5f420cb6667430edaaef2d97bb85b170db67c45d
Subproject commit 969f062d319ab9e3d341c6e661eedd51eefa50a2

2
lang

@ -1 +1 @@
Subproject commit 9a59b4db25598d735eb1ef365b6e69bff3f3e080
Subproject commit cf710f2017db93c4019ce53a03764edf3136fa84