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
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>