Merge pull request #1747 from xsacha/master

Add FFMPEG support to Blackberry10
This commit is contained in:
Henrik Rydgård committed 2013-05-10 14:19:15 -07:00
commit 44b206cf27
2 files changed
+6 -1

No files matched your search

+5
View File
@@ -455,6 +455,11 @@ elseif(USING_QT_UI)
elseif(BLACKBERRY)
set(nativeExtra ${nativeExtra} native/base/BlackberryMain.cpp)
set(nativeExtraLibs ${nativeExtraLibs} asound 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)
set(TargetBin PPSSPPBlackberry)
elseif(SDL_FOUND)
# Require SDL
+1 -1
Submodule ffmpeg updated: 1b89089c9c...df276d73d5.