diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index 384b1f589..831bd20e5 100755 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -11,7 +11,7 @@ mobile_platform: MOBILITY += sensors symbian: MOBILITY += systeminfo # Libs -symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib +symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib -L ffmpeg/symbian/armv6/lib -lavformat.a -lavcodec.a -lswresample.a -lswscale.a qnx: LIBS += -L. -lCore -lCommon -lNative -lscreen -lz win32 { CONFIG(release, debug|release) { diff --git a/Qt/Settings.pri b/Qt/Settings.pri index b18172f15..42dccc57d 100644 --- a/Qt/Settings.pri +++ b/Qt/Settings.pri @@ -43,7 +43,7 @@ symbian { # Does not seem to be a way to change to armv6 compile so just override in variants.xml (see README) MMP_RULES -= "ARMFPU softvfp+vfpv2" MMP_RULES += "ARMFPU vfpv2" - DEFINES += "BOOST_COMPILER_CONFIG=" + DEFINES += USE_FFMPEG "BOOST_COMPILER_CONFIG=" QMAKE_CXXFLAGS += -marm -Wno-parentheses -Wno-comment INCLUDEPATH += $$EPOCROOT/epoc32/include/stdapis/glib-2.0 } diff --git a/ffmpeg b/ffmpeg index e8ef410aa..84dac8cd4 160000 --- a/ffmpeg +++ b/ffmpeg @@ -1 +1 @@ -Subproject commit e8ef410aac458a35064e67582fb80103c29e6474 +Subproject commit 84dac8cd4af62868ddc18ee813931e5a4788c28d