mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-14 01:59:34 +01:00
Build fix for linux using Qt build tools. Corrects gcc version detection. Before patch some lines in g++ --vesrion output could be incorrectly recognized as version 4.6 and therefore keyword "override" would be declared as macro despite being known to compiler. This was leading to compile error. Should fix #8695.
This commit is contained in:
1 parent
08ec95ae4f
commit
1cd89a019c
2 files changed
+2
-2
No files matched your search
+1
-1
@@ -7,7 +7,7 @@ CONFIG += staticlib
|
||||
include(Settings.pri)
|
||||
|
||||
# To support Sailfish which is stuck on GCC 4.6
|
||||
linux-g++:system($$QMAKE_CXX --version | grep "4.6."): DEFINES+=override
|
||||
linux-g++:system($$QMAKE_CXX --version | grep \"4\.6\.\"): DEFINES+=override
|
||||
|
||||
INCLUDEPATH += $$P/ext/native
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ else: LIBS += -lCore -lGPU -lCommon -lNative
|
||||
include(Settings.pri)
|
||||
|
||||
# To support Sailfish which is stuck on GCC 4.6
|
||||
linux-g++:system($$QMAKE_CXX --version | grep "4.6."): DEFINES+=override
|
||||
linux-g++:system($$QMAKE_CXX --version | grep \"4\.6\.\"): DEFINES+=override
|
||||
|
||||
lessThan(QT_MAJOR_VERSION, 5) {
|
||||
macx: error(PPSSPP requires Qt5 for OS X but $$[QT_VERSION] was detected.)
|
||||
|
||||
Reference in new issue
Block a user