From d46397627edb71dfe0cc1ed11dfa09a908901e5d Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Tue, 28 Feb 2017 08:59:53 +0100
Subject: [PATCH] Buildfixes

---
 CMakeLists.txt                            | 1 -
 Core/FileLoaders/RamCachingFileLoader.cpp | 2 ++
 GPU/Debugger/Stepping.cpp                 | 4 +++-
 android/jni/app-android.cpp               | 3 ++-
 ext/native/thread/threadpool.h            | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e01d2efa..5c52c117b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -792,7 +792,6 @@ add_library(native STATIC
 	ext/native/base/display.h
 	ext/native/base/linked_ptr.h
 	ext/native/base/logging.h
-	ext/native/base/mutex.h
 	ext/native/base/stringutil.cpp
 	ext/native/base/stringutil.h
 	ext/native/base/timeutil.cpp
diff --git a/Core/FileLoaders/RamCachingFileLoader.cpp b/Core/FileLoaders/RamCachingFileLoader.cpp
index 1f1c5a5ea..b793684da 100644
--- a/Core/FileLoaders/RamCachingFileLoader.cpp
+++ b/Core/FileLoaders/RamCachingFileLoader.cpp
@@ -18,6 +18,8 @@
 #include <algorithm>
 #include <thread>
 #include <cstring>
+#include <cstdlib>
+
 #include "base/timeutil.h"
 #include "thread/threadutil.h"
 #include "Core/FileLoaders/RamCachingFileLoader.h"
diff --git a/GPU/Debugger/Stepping.cpp b/GPU/Debugger/Stepping.cpp
index 017791f21..3afff2b1c 100644
--- a/GPU/Debugger/Stepping.cpp
+++ b/GPU/Debugger/Stepping.cpp
@@ -16,6 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <mutex>
+#include <condition_variable>
+
 #include "GPU/Common/GPUDebugInterface.h"
 #include "GPU/Debugger/Stepping.h"
 #include "GPU/GPUState.h"
@@ -201,4 +203,4 @@ void ForceUnpause() {
 	actionWait.notify_one();
 }
 
-}  // namespace
\ No newline at end of file
+}  // namespace
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 57c455b43..19611f350 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -16,6 +16,7 @@
 #include <GLES2/gl2ext.h>
 #include <queue>
 #include <mutex>
+#include <thread>
 
 #include "base/basictypes.h"
 #include "base/stringutil.h"
@@ -319,7 +320,7 @@ void AndroidVulkanContext::Resize() {
 void AndroidVulkanContext::SwapInterval(int interval) {
 }
 
-static std::recursive_mutex frameCommandLock;
+static std::mutex frameCommandLock;
 static std::queue<FrameCommand> frameCommands;
 
 std::string systemName;
diff --git a/ext/native/thread/threadpool.h b/ext/native/thread/threadpool.h
index 415adbed3..220d9aa82 100644
--- a/ext/native/thread/threadpool.h
+++ b/ext/native/thread/threadpool.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <thread>
 #include <mutex>
+#include <condition_variable>
 
 // This is the simplest possible worker implementation I can think of
 // but entirely sufficient for the given purpose.