Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Qt: Revert annoying git_version string to support all qmake's + symbian.

Browse source
This commit is contained in:
Sacha 2014-06-26 17:59:00 +10:00
parent e1f2317e0c
commit 010517910f
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Qt/Settings.pri
View file

@ -13,11 +13,15 @@ UI_DIR = $$CONFIG_DIR/.ui/$$TARGET
P = $$_PRO_FILE_PWD_/..
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:greaterThan(QT_MAJOR_VERSION,4): DEFINES += PPSSPP_GIT_VERSION=$$shell_quote(\"$$GIT_VERSION\")
else: DEFINES += PPSSPP_GIT_VERSION=$$quote($$GIT_VERSION)
symbian {
exists($$P/.git): GIT_VERSION = $$system(git describe --always)
isEmpty(GIT_VERSION): GIT_VERSION = $$VERSION
} else {
# QMake seems to change how it handles quotes with every version. This works for most systems:
exists($$P/.git): GIT_VERSION = '\\"$$system(git describe --always)\\"'
isEmpty(GIT_VERSION): GIT_VERSION = '\\"$$VERSION\\"'
}
DEFINES += PPSSPP_GIT_VERSION=\"$$GIT_VERSION\"
win32-msvc* {
QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast

2
native

@ -1 +1 @@
Subproject commit 9c0d44ceb0b628b5d66f9257e8f59cf97a9ab888
Subproject commit 320f5f1952c1c462e67c634af7455105967fc602