Qt: Fix for audiooutput on qt5. Final fix for arch detection.

This commit is contained in:
Sacha 2013-10-20 02:44:03 +10:00
parent 721bc6f34f
commit 027ba31752
2 changed files with 11 additions and 6 deletions

View File

@ -1,9 +1,12 @@
TARGET = PPSSPPQt
QT += core gui opengl
CONFIG += mobility
MOBILITY += multimedia
win32: QT += multimedia
win32|greaterThan(QT_MAJOR_VERSION,4) {
QT += multimedia
} else {
CONFIG += mobility
MOBILITY += multimedia
}
greaterThan(QT_MAJOR_VERSION,4): QT += widgets
VERSION = 0.9.1

View File

@ -18,7 +18,6 @@ win32-msvc* {
QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O3
}
# Arch specific
xarch = $$find(QT_ARCH, "86")
contains(QT_ARCH, windows)|count(xarch, 1) {
@ -46,8 +45,11 @@ contains(MEEGO_EDITION,harmattan): {
linux:!mobile_platform: {
DEFINES += __STDC_CONSTANT_MACROS
g++-32:QMAKE_TARGET.arch = x86
linux-g++-64:QMAKE_TARGET.arch = x86_64
contains(QT_ARCH, x86_64) {
QMAKE_TARGET.arch = x86_64
} else {
QMAKE_TARGET.arch = x86
}
INCLUDEPATH += ../ffmpeg/linux/$${QMAKE_TARGET.arch}/include
}
qnx {