From 649f12f8ab8bd633dce35e400dccdbee41059319 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 10 Jul 2020 06:48:20 +0200
Subject: [PATCH] (Libretro) Buildfixes

---
 Core/HLE/sceUsbCam.cpp   | 12 ++++++++----
 libretro/Makefile.common |  4 +++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Core/HLE/sceUsbCam.cpp b/Core/HLE/sceUsbCam.cpp
index c2ab2979fa..c2d0ed1609 100644
--- a/Core/HLE/sceUsbCam.cpp
+++ b/Core/HLE/sceUsbCam.cpp
@@ -26,7 +26,11 @@
 #include "Core/HW/Camera.h"
 #include "Core/MemMapHelpers.h"
 
-#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
+#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP) && !defined(__LIBRETRO__)
+#define HAVE_WIN32_CAMERA
+#endif
+
+#ifdef HAVE_WIN32_CAMERA
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
@@ -300,7 +304,7 @@ void Register_sceUsbCam()
 }
 
 std::vector<std::string> Camera::getDeviceList() {
-	#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
+   #ifdef HAVE_WIN32_CAMERA
 		if (winCamera) {
 			return winCamera->getDeviceList();
 		}
@@ -320,7 +324,7 @@ int Camera::startCapture() {
 	INFO_LOG(HLE, "%s resolution: %dx%d", __FUNCTION__, width, height);
 
 	config->mode = Camera::Mode::Video;
-	#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
+   #ifdef HAVE_WIN32_CAMERA
 		if (winCamera) {
 			if (winCamera->isShutDown()) {
 				delete winCamera;
@@ -344,7 +348,7 @@ int Camera::startCapture() {
 
 int Camera::stopCapture() {
 	INFO_LOG(HLE, "%s", __FUNCTION__);
-	#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
+   #ifdef HAVE_WIN32_CAMERA
 		if (winCamera) {
 			winCamera->sendMessage({ CAPTUREDEVIDE_COMMAND::STOP, nullptr });
 		}
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index ef28c58eca..4387a5ae0c 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -308,6 +308,7 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
           $(NATIVEDIR)/thin3d/DataFormatGL.cpp \
 	       $(NATIVEDIR)/thread/threadutil.cpp \
 	       $(NATIVEDIR)/thread/threadpool.cpp \
+	       $(NATIVEDIR)/thread/prioritizedworkqueue.cpp \
 	       $(NATIVEDIR)/ui/root.cpp \
 	       $(NATIVEDIR)/ui/screen.cpp \
 	       $(NATIVEDIR)/ui/ui.cpp \
@@ -478,7 +479,8 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
 	       $(COREDIR)/Util/PPGeDraw.cpp \
 	       $(COREDIR)/Util/AudioFormat.cpp \
           $(EXTDIR)/disarm.cpp \
-          $(CORE_DIR)/UI/TextureUtil.cpp
+          $(CORE_DIR)/UI/TextureUtil.cpp \
+          $(CORE_DIR)/UI/GameInfoCache.cpp
 
 SOURCES_CXX += $(COREDIR)/HLE/__sceAudio.cpp