Buildfixes

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

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"

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
+}  // namespace

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;

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.