From 3859b4713ab21301193e5510a17ba8bcf8aa04ae Mon Sep 17 00:00:00 2001
From: Gabriel <g2p.code@gmail.com>
Date: Thu, 18 Dec 2014 23:59:22 +0100
Subject: [PATCH] Pass -D SDL when SDL is used

Update the Qt build to use the same define
so that common files can use it.
---
 CMakeLists.txt | 1 +
 Qt/PPSSPP.pro  | 4 ++--
 native         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b593a9ae1e..a527b1c08c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -764,6 +764,7 @@ elseif(SDL2_FOUND)
 	set(TargetBin PPSSPPSDL)
 	# Require SDL
 	include_directories(${SDL2_INCLUDE_DIR})
+	add_definitions(-DSDL)
 	set(nativeExtra ${nativeExtra} 
 		SDL/SDLJoystick.h
 		SDL/SDLJoystick.cpp
diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index b27357d982..42adfdc14a 100644
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -38,7 +38,7 @@ macx|equals(PLATFORM_NAME, "linux") {
 	PRE_TARGETDEPS += $$CONFIG_DIR/libCommon.a $$CONFIG_DIR/libCore.a $$CONFIG_DIR/libGPU.a $$CONFIG_DIR/libNative.a
 	CONFIG += link_pkgconfig
 	packagesExist(sdl2) {
-		DEFINES += QT_HAS_SDL
+		DEFINES += SDL
 		SOURCES += $$P/SDL/SDLJoystick.cpp
 		HEADERS += $$P/SDL/SDLJoystick.h
 		PKGCONFIG += sdl2
@@ -54,7 +54,7 @@ unix:contains(QT_CONFIG, system-zlib) {
 }
 
 # Qt Multimedia (if SDL is not found)
-!contains(DEFINES, QT_HAS_SDL) {
+!contains(DEFINES, SDL) {
 	lessThan(QT_MAJOR_VERSION,5):!exists($$[QT_INSTALL_HEADERS]/QtMultimedia) {
 		# Fallback to mobility audio
 		CONFIG += mobility
diff --git a/native b/native
index c958ca6b4c..3a400fdd38 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit c958ca6b4c05364c1c2a4e3eda5b355328ec8049
+Subproject commit 3a400fdd381cd27f0f138e52c7e363ae182b3b5d