From 3c49805be98fe58d62244b9a7e2fa3082f9a77af Mon Sep 17 00:00:00 2001
From: snes2600 <52765182+snes2600@users.noreply.github.com>
Date: Sat, 17 Aug 2019 22:34:25 -0500
Subject: [PATCH 1/2] libretro: fix missing JoyMap class

---
 src/libretro/Stella.vcxproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libretro/Stella.vcxproj b/src/libretro/Stella.vcxproj
index 66451e396..95827d1d5 100644
--- a/src/libretro/Stella.vcxproj
+++ b/src/libretro/Stella.vcxproj
@@ -137,6 +137,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\JoyMap.cxx" />
     <ClCompile Include="..\common\KeyMap.cxx" />
     <ClCompile Include="..\common\Logger.cxx" />
     <ClCompile Include="libretro.cxx" />
@@ -414,4 +415,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

From 74959ba26c778d3ed9209cc4aa08c038ffd339d0 Mon Sep 17 00:00:00 2001
From: Aaron Kling <webgeek1234@gmail.com>
Date: Thu, 20 Jun 2019 10:09:26 -0500
Subject: [PATCH 2/2] libretro: allow mingw cross compile

---
 src/libretro/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libretro/Makefile b/src/libretro/Makefile
index adcbbe3b1..156588481 100644
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -497,7 +497,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
 # Windows
 else
    TARGET := $(TARGET_NAME)_libretro.dll
-   CXX = g++
+   CXX ?= g++
    SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T
    CXXFLAGS += -D__WIN32__
 endif