ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2019-05-23 19:05:00 +02:00
parent d2027a8a97 8b5e45d810
commit acbe9b2677
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libretro/Makefile
View File

@ -395,10 +395,9 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
PATH := $(shell IFS=$$'\n'; cygpath "$(VCCompilerToolsBinDir)/$(TargetArchMoniker)"):$(PATH) PATH := $(shell IFS=$$'\n'; cygpath "$(VCCompilerToolsBinDir)/$(TargetArchMoniker)"):$(PATH)
PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VsInstallRoot)/Common7/IDE") PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VsInstallRoot)/Common7/IDE")
INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/include") INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/include")
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)")
ifneq (,$(findstring uwp,$(PlatformSuffix))) ifneq (,$(findstring uwp,$(PlatformSuffix)))
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker/store)") LIB := $(shell IFS=$$'\n'; cygpath -w "$(LIB)/store")
else
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)")
endif endif
export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir) export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)

4
src/libretro/Stella.vcxproj
View File

@ -157,7 +157,6 @@
<ClCompile Include="..\common\RewindManager.cxx" /> <ClCompile Include="..\common\RewindManager.cxx" />
<ClCompile Include="..\common\StaggeredLogger.cxx" /> <ClCompile Include="..\common\StaggeredLogger.cxx" />
<ClCompile Include="..\common\StateManager.cxx" /> <ClCompile Include="..\common\StateManager.cxx" />
<ClCompile Include="..\common\ThreadDebugging.cxx" />
<ClCompile Include="..\common\TimerManager.cxx" /> <ClCompile Include="..\common\TimerManager.cxx" />
<ClCompile Include="..\common\repository\KeyValueRepositoryConfigfile.cxx" /> <ClCompile Include="..\common\repository\KeyValueRepositoryConfigfile.cxx" />
<ClCompile Include="..\common\tv_filters\AtariNTSC.cxx" /> <ClCompile Include="..\common\tv_filters\AtariNTSC.cxx" />
@ -281,7 +280,6 @@
<ClInclude Include="..\common\StateManager.hxx" /> <ClInclude Include="..\common\StateManager.hxx" />
<ClInclude Include="..\common\StellaKeys.hxx" /> <ClInclude Include="..\common\StellaKeys.hxx" />
<ClInclude Include="..\common\StringParser.hxx" /> <ClInclude Include="..\common\StringParser.hxx" />
<ClInclude Include="..\common\ThreadDebugging.hxx" />
<ClInclude Include="..\common\TimerManager.hxx" /> <ClInclude Include="..\common\TimerManager.hxx" />
<ClInclude Include="..\common\tv_filters\AtariNTSC.hxx" /> <ClInclude Include="..\common\tv_filters\AtariNTSC.hxx" />
<ClInclude Include="..\common\tv_filters\NTSCFilter.hxx" /> <ClInclude Include="..\common\tv_filters\NTSCFilter.hxx" />
@ -414,4 +412,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

2
src/libretro/StellaLIBRETRO.cxx
View File

@ -284,7 +284,7 @@ float StellaLIBRETRO::getVideoAspectPar()
else else
par = video_aspect_pal / 100.0; par = video_aspect_pal / 100.0;
} }
return par; return par;
} }