Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Qt: Fix some qmake replace commands that work differently on different versions of qmake. Use SDL Audio when available. Fix a bug. Qt4+Qt5 tested working perfectly on Arch Linux.

Browse Source
This commit is contained in:
Sacha 2014-06-25 13:24:19 +10:00
parent d040b980dd
commit 92db2c89c1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Qt/PPSSPP.pro
View File

@ -116,9 +116,9 @@ else {
# Creating translations should be done by Qt, really
LREL_TOOL = lrelease
# Grab all possible directories (win32/unix) and search from last to first
win32: PATHS = $$reverse($$split($$(PATH), ;))
else: PATHS = $$reverse($$split($$(PATH), :))
# Grab all possible directories (win32/unix)
win32: PATHS = $$split($$(PATH), ;)
else: PATHS = $$split($$(PATH), :)
greaterThan(QT_MAJOR_VERSION, 4) {
for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt5): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt5
} else {

3
Qt/Settings.pri
View File

@ -16,7 +16,8 @@ INCLUDEPATH += $$P/ext/zlib $$P/Common
exists($$P/.git): GIT_VERSION = $$system(git describe --always)
isEmpty(GIT_VERSION): GIT_VERSION = $$VERSION
symbian: DEFINES += "PPSSPP_GIT_VERSION=\"$$GIT_VERSION\""
else: DEFINES += PPSSPP_GIT_VERSION=$$shell_quote(\"$$GIT_VERSION\")
else:greaterThan(QT_MAJOR_VERSION,4): DEFINES += PPSSPP_GIT_VERSION=$$shell_quote(\"$$GIT_VERSION\")
else: DEFINES += PPSSPP_GIT_VERSION=$$quote($$GIT_VERSION)
win32-msvc* {
QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast

2
native

@ -1 +1 @@
Subproject commit 8685d02e6d44cbe327ab49f69efbcc1275771d6f
Subproject commit c50c17d6eba1be98ce6a10726ccf11cd543c1b4c