libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-31 22:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Drop QtMultimedia dependency if SDL is used. Force OSX10.9 SDK. Should fix #5835

Browse Source
This commit is contained in:
Sacha 2014-07-01 17:16:13 +10:00
parent 86284aa91a
commit 5c6ccfe56d
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Qt/PPSSPP.pro
View File

@ -10,13 +10,6 @@ lessThan(QT_MAJOR_VERSION, 5) {
}
# Extra Qt modules
linux:lessThan(QT_MAJOR_VERSION,5):!exists($$[QT_INSTALL_HEADERS]/QtMultimedia) {
# Ubuntu et al workaround. They forgot QtMultimedia
CONFIG += mobility
MOBILITY += multimedia
}
else: QT += multimedia
greaterThan(QT_MAJOR_VERSION,4) {
QT += widgets
mobile_platform: QT += sensors
@ -69,6 +62,7 @@ macx|linux {
}
}
}
linux:!android: LIBS += -ldl -lrt
macx: LIBS += -liconv
qnx: LIBS += -lscreen
@ -78,6 +72,16 @@ unix:contains(QT_CONFIG, system-zlib) {
LIBS += -lz
}
# Qt Multimedia (if SDL is not found)
!contains(DEFINES, QT_HAS_SDL) {
linux:lessThan(QT_MAJOR_VERSION,5):!exists($$[QT_INSTALL_HEADERS]/QtMultimedia) {
# Fallback to mobility audio
CONFIG += mobility
MOBILITY += multimedia
}
else: QT += multimedia
}
# Main
SOURCES += $$P/native/base/QtMain.cpp
HEADERS += $$P/native/base/QtMain.h

5
Qt/Settings.pri
View File

@ -72,7 +72,10 @@ contains(QT_CONFIG, opengles.) {
contains(MEEGO_EDITION,harmattan): DEFINES += "_SYS_UCONTEXT_H=1"
maemo: DEFINES += MAEMO
macx: INCLUDEPATH += $$P/ffmpeg/macosx/x86_64/include
macx {
QMAKE_MAC_SDK=macosx10.9
INCLUDEPATH += $$P/ffmpeg/macosx/x86_64/include
}
ios: INCLUDEPATH += $$P/ffmpeg/ios/universal/include
android {
DEFINES += ANDROID

2
native

@ -1 +1 @@
Subproject commit 179347a493ed58af9ecaefb8695b2a84a1d8d3a0
Subproject commit 8538a5bf74e50bffff193b818062f061e8dd9763