From baf4dc8d07b4dccc52febc0f34fc515ce59455e2 Mon Sep 17 00:00:00 2001 From: funbars <50187994+funbars@users.noreply.github.com> Date: Tue, 21 May 2019 20:45:55 -0500 Subject: [PATCH 1/2] libretro uwp (fix) --- src/libretro/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libretro/Makefile b/src/libretro/Makefile index a15ae82af..1a510aa90 100644 --- a/src/libretro/Makefile +++ b/src/libretro/Makefile @@ -395,10 +395,9 @@ else ifneq (,$(findstring windows_msvc2017,$(platform))) PATH := $(shell IFS=$$'\n'; cygpath "$(VCCompilerToolsBinDir)/$(TargetArchMoniker)"):$(PATH) PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VsInstallRoot)/Common7/IDE") INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/include") + LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)") ifneq (,$(findstring uwp,$(PlatformSuffix))) - LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker/store)") - else - LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)") + LIB := $(shell IFS=$$'\n'; cygpath -w "$(LIB)/store") endif export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir) From 8b5e45d81021100e8be04a7425f7e8331a23b25f Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Wed, 22 May 2019 08:50:38 -0230 Subject: [PATCH 2/2] libretro: remove unneeded file. --- src/libretro/Stella.vcxproj | 4 +--- src/libretro/StellaLIBRETRO.cxx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libretro/Stella.vcxproj b/src/libretro/Stella.vcxproj index 5e1b47a2a..ec71d2879 100644 --- a/src/libretro/Stella.vcxproj +++ b/src/libretro/Stella.vcxproj @@ -157,7 +157,6 @@ - @@ -281,7 +280,6 @@ - @@ -414,4 +412,4 @@ - + \ No newline at end of file diff --git a/src/libretro/StellaLIBRETRO.cxx b/src/libretro/StellaLIBRETRO.cxx index 105dcb251..ac6ea49ac 100644 --- a/src/libretro/StellaLIBRETRO.cxx +++ b/src/libretro/StellaLIBRETRO.cxx @@ -284,7 +284,7 @@ float StellaLIBRETRO::getVideoAspectPar() else par = video_aspect_pal / 100.0; } - + return par; }