From d6709a0b3234d1c271ce86b97c9919b0e55c8cf1 Mon Sep 17 00:00:00 2001 From: Sacha Date: Wed, 28 Aug 2013 03:19:37 +1000 Subject: [PATCH] Remove unnecessary define. Add Qt5 compatibility to qmake file. --- CMakeLists.txt | 2 +- Qt/PPSSPP.pro | 1 + native | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e75915160..166cd4d059 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,7 @@ if(NOT MSVC) endif() if(BLACKBERRY) - add_definitions(-D_QNX_SOURCE=1 -D_C99=1 -O3 -mfpu=neon -mtune=cortex-a9) + add_definitions(-D_QNX_SOURCE -O3 -mfpu=neon -mtune=cortex-a9) endif() if(X86 AND NOT MIPS) diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index 71c5041689..a430d4f93d 100755 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -4,6 +4,7 @@ QT += core gui opengl CONFIG += mobility MOBILITY += multimedia win32: QT += multimedia +greaterThan(QT_MAJOR_VERSION,4): QT += widgets VERSION = 0.9.1 include(Settings.pri) diff --git a/native b/native index 885e7163ed..ed1df8fb88 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 885e7163ed316406d966184e89f2ca06362e9cbc +Subproject commit ed1df8fb888c9cabd8d0dcba15a1e4a8686538db