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

Qt: Basic iOS support. iOS now fully supported in QtCreator 3.0 + Qt 5.2

Browse Source
This commit is contained in:
Sacha 2013-11-24 13:36:22 +10:00
parent 1ee0fbf94c
commit 70d7f69c5d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Qt/PPSSPP.pro
View File

@ -27,10 +27,11 @@ QMAKE_LIBDIR += $$CONFIG_DIR
LIBS += -lCore -lCommon -lNative
# FFMPEG Path
win32: QMAKE_LIBDIR += $$P/ffmpeg/Windows/$${QMAKE_TARGET.arch}/lib/
linux: QMAKE_LIBDIR += $$P/ffmpeg/linux/$${QMAKE_TARGET.arch}/lib/
macx:!mobile_platform: FFMPEG_DIR = $$P/ffmpeg/macosx/x86_64/lib/
qnx: QMAKE_LIBDIR += $$P/ffmpeg/blackberry/armv7/lib/
win32: QMAKE_LIBDIR += $$P/ffmpeg/Windows/$${QMAKE_TARGET.arch}/lib/
linux: QMAKE_LIBDIR += $$P/ffmpeg/linux/$${QMAKE_TARGET.arch}/lib/
macx: QMAKE_LIBDIR += $$P/ffmpeg/macosx/x86_64/lib/
ios: QMAKE_LIBDIR += $$P/ffmpeg/ios/universal/lib/
qnx: QMAKE_LIBDIR += $$P/ffmpeg/blackberry/armv7/lib/
symbian:QMAKE_LIBDIR += $$P/ffmpeg/symbian/armv6/lib/
contains(DEFINES, USE_FFMPEG): LIBS += -lavformat -lavcodec -lavutil -lswresample -lswscale
@ -47,7 +48,7 @@ win32 {
}
linux {
LIBS += -ldl
PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a
PRE_TARGETDEPS += $$CONFIG_DIR/libCommon.a $$CONFIG_DIR/libCore.a $$CONFIG_DIR/libNative.a
packagesExist(sdl) {
DEFINES += QT_HAS_SDL
SOURCES += $$P/SDL/SDLJoystick.cpp

6
Qt/Settings.pri
View File

@ -54,12 +54,16 @@ contains(MEEGO_EDITION,harmattan) {
DEFINES += MEEGO_EDITION_HARMATTAN "_SYS_UCONTEXT_H=1"
}
macx:!mobile_platform {
macx {
INCLUDEPATH += $$P/ffmpeg/macosx/x86_64/include
#the qlist headers include <initializer_list> in QT5
greaterThan(QT_MAJOR_VERSION,4):CONFIG+=c++11
}
ios {
INCLUDEPATH += $$P/ffmpeg/ios/universal/include
}
linux:!mobile_platform {
contains(QT_ARCH, x86_64): QMAKE_TARGET.arch = x86_64
else: QMAKE_TARGET.arch = x86