From 8c52ce32747ec72cbfe18d7f4c85ec874c704753 Mon Sep 17 00:00:00 2001
From: Retem <bigpet@Retems-Mac.local>
Date: Sat, 16 Nov 2013 16:49:08 +0100
Subject: [PATCH] OSX build fixes for the Qt version

---
 Qt/PPSSPP.pro         | 1 +
 Qt/Settings.pri       | 6 ++++++
 Qt/ctrldisasmview.cpp | 2 ++
 Qt/ctrlmemview.cpp    | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 45698cd07b..50d1a34d28 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -30,6 +30,7 @@ LIBS += -lCore$${XT} -lCommon$${XT} -lNative$${XT}
 # FFMPEG Path
 win32:  FFMPEG_DIR = ../ffmpeg/Windows/$${QMAKE_TARGET.arch}/lib/
 linux:  FFMPEG_DIR = ../ffmpeg/linux/$${QMAKE_TARGET.arch}/lib/
+macx|!mobile_platform:   FFMPEG_DIR = ../ffmpeg/macosx/x86_64/lib/
 qnx:    FFMPEG_DIR = ../ffmpeg/blackberry/armv7/lib/
 symbian:FFMPEG_DIR = -l
 
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index d696b792c6..b0838afed3 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -52,6 +52,12 @@ contains(MEEGO_EDITION,harmattan) {
 	DEFINES += MEEGO_EDITION_HARMATTAN "_SYS_UCONTEXT_H=1"
 }
 
+macx:!mobile_platform {
+	INCLUDEPATH += ../ffmpeg/macosx/x86_64/include
+	#the qlist headers include <initializer_list> in QT5
+	greaterThan(QT_MAJOR_VERSION,4):CONFIG+=c++11
+}
+
 linux:!mobile_platform {
 	contains(QT_ARCH, x86_64): QMAKE_TARGET.arch = x86_64
 	else: QMAKE_TARGET.arch = x86
diff --git a/Qt/ctrldisasmview.cpp b/Qt/ctrldisasmview.cpp
index 3bf021f23e..e896597b0a 100644
--- a/Qt/ctrldisasmview.cpp
+++ b/Qt/ctrldisasmview.cpp
@@ -8,6 +8,8 @@
 #include <QInputDialog>
 #include <QMessageBox>
 
+#include "math.h"
+
 #include "debugger_disasm.h"
 #include "Core/Debugger/SymbolMap.h"
 
diff --git a/Qt/ctrlmemview.cpp b/Qt/ctrlmemview.cpp
index ddd05047e2..e9b08a3773 100644
--- a/Qt/ctrlmemview.cpp
+++ b/Qt/ctrlmemview.cpp
@@ -8,6 +8,8 @@
 #include <QClipboard>
 #include <QInputDialog>
 
+#include "math.h"
+
 #include "EmuThread.h"
 #include "Core/MemMap.h"
 #include "Core/Debugger/SymbolMap.h"