mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-26 11:48:36 +01:00
Qt: Drop QtMultimedia dependency if SDL is used. Force OSX10.9 SDK. Should fix #5835
This commit is contained in:
1 parent
86284aa91a
commit
5c6ccfe56d
3 files changed
+16
-9
No files matched your search
+11
-7
@@ -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
|
||||
|
||||
+4
-1
@@ -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
|
||||
|
||||
+1
-1
Submodule native updated: 179347a493...8538a5bf74.
Reference in new issue
Block a user