(MSVC) Should fix MSVC and hopefully not cause regressions

This commit is contained in:
twinaphex 2020-01-07 17:53:43 +01:00
parent 48e1bf20ad
commit 2a66db8f7b
4 changed files with 4 additions and 4 deletions

View File

@ -654,7 +654,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
ProgramFiles86w := $(shell cmd /c "echo %PROGRAMFILES(x86)%")
ProgramFiles86w := $(shell cmd //c "echo %PROGRAMFILES(x86)%")
ProgramFiles86 := $(shell cygpath "$(ProgramFiles86w)")
WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)

@ -1 +1 @@
Subproject commit 5fc93bddb71461abb7619cf506d6f15ba8a675f3
Subproject commit 94a9d9a888e72cbfa4db12113cd113cf5e154f7f

@ -1 +1 @@
Subproject commit f8cd6a082bb9c228397a0436f28818b74d8e9636
Subproject commit 795b71c571518b310a22138141bb6d1cd08d85f6

View File

@ -1513,7 +1513,7 @@ void retro_run(void)
ps2->padding = padding;
#else
buff = vout_buf + vout_offset;
buff = (char*)vout_buf + vout_offset;
#endif
video_cb((short *)buff,