4 files changed, 522 insertions, 18 deletions

diff --git a/games/libretro-xrick/Makefile b/games/libretro-xrick/Makefile
index 5ead822d8a77..d1da00cb62ad 100644
--- a/games/libretro-xrick/Makefile
+++ b/games/libretro-xrick/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libretro-xrick
-PORTVERSION=	0.20201218
+PORTVERSION=	0.20220331
 CATEGORIES=	games
 
 MAINTAINER=	dmenelkir@gmail.com
@@ -7,15 +7,15 @@ COMMENT=	Libretro implementation of "Rick Dangerous"
 
 LICENSE=	GPLv2
 
-USES=		gmake localbase sdl dos2unix
+USES=		gmake localbase sdl
 USE_SDL=	sdl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	xrick-libretro
-GH_TAGNAME=	0aad6c6
+GH_TAGNAME=	10d7318
 
-MAKEFILE=	Makefile.libretro
+MAKEFILE=	Makefile.freebsd
 DOS2UNIX_FILES=	${MAKEFILE}
 
 PLIST_FILES=	lib/libretro/xrick_libretro.so
diff --git a/games/libretro-xrick/distinfo b/games/libretro-xrick/distinfo
index 15f124e045d2..696d39a48fb9 100644
--- a/games/libretro-xrick/distinfo
+++ b/games/libretro-xrick/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608288977
-SHA256 (libretro-xrick-libretro-0.20201218-0aad6c6_GH0.tar.gz) = 7697696c0f4bf42f8564f6cfa19d5d680cba1c11f7e585b3c952a579622c2e06
-SIZE (libretro-xrick-libretro-0.20201218-0aad6c6_GH0.tar.gz) = 1821992
+TIMESTAMP = 1649329548
+SHA256 (libretro-xrick-libretro-0.20220331-10d7318_GH0.tar.gz) = 7697dbd078eb1b4d501635fe2d4f5292b692328d5d560ae65592b89b796dde3a
+SIZE (libretro-xrick-libretro-0.20220331-10d7318_GH0.tar.gz) = 1810919
diff --git a/games/libretro-xrick/files/patch-Makefile.freebsd b/games/libretro-xrick/files/patch-Makefile.freebsd
new file mode 100644
index 000000000000..78980afab6a3
--- /dev/null
+++ b/games/libretro-xrick/files/patch-Makefile.freebsd
@@ -0,0 +1,515 @@
+--- Makefile.freebsd.orig	2022-04-07 11:21:27 UTC
++++ Makefile.freebsd
+@@ -0,0 +1,512 @@
++STATIC_LINKING=0
++STATIC_LINKING_LINK=0
++
++CORE_DIR := .
++WANT_ZLIB=1
++
++ifeq ($(platform),)
++platform = unix
++ifeq ($(shell uname -a),)
++   platform = win
++else ifneq ($(findstring MINGW,$(shell uname -a)),)
++   platform = win
++else ifneq ($(findstring Darwin,$(shell uname -a)),)
++   platform = osx
++else ifneq ($(findstring win,$(shell uname -a)),)
++   platform = win
++endif
++endif
++
++TARGET_NAME := xrick
++
++ifeq ($(STATIC_LINKING),1)
++EXT=a
++
++ifeq ($(platform), unix)
++PLAT=_unix
++STATIC_LINKING=1
++STATIC_LINKING_LINK=1
++endif
++endif
++
++CFLAGS += -DFRONTEND_SUPPORTS_RGB565
++
++ifeq ($(platform), android)
++   CC = arm-linux-androideabi-gcc
++   AR = @arm-linux-androideabi-ar
++   LD = @arm-linux-androideabi-g++ 
++   TARGET := $(TARGET_NAME)_libretro.so
++   fpic := -fPIC
++   SHARED :=  -Wl,--fix-cortex-a8 -llog --shared -Wl,--version-script=$(CORE_DIR)/libretro/core/link.T -Wl,--no-undefined
++
++else ifeq ($(platform), unix)
++   CC?= gcc
++ TARGET := $(TARGET_NAME)_libretro.so
++   fpic := -fPIC
++   ifneq ($(findstring SunOS,$(shell uname -a)),)
++      SHARED := -shared -z defs
++   else
++      SHARED := -shared -Wl,--version-script=$(CORE_DIR)/libretro/core/link.T -Wl,--no-undefined
++   endif
++
++# Classic Platforms ####################
++# Platform affix = classic_<ISA>_<µARCH>
++# Help at https://modmyclassic.com/comp
++
++# (armv7 a7, hard point, neon based) ### 
++# NESC, SNESC, C64 mini 
++else ifeq ($(platform), classic_armv7_a7)
++	TARGET := $(TARGET_NAME)_libretro.so
++	fpic := -fPIC
++        SHARED :=  -shared -Wl,--version-script=$(CORE_DIR)/libretro/core/link.T -Wl,--no-undefined
++	CFLAGS += -Ofast \
++	-flto=4 -fwhole-program -fuse-linker-plugin \
++	-fdata-sections -ffunction-sections -Wl,--gc-sections \
++	-fno-stack-protector -fno-ident -fomit-frame-pointer \
++	-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
++	-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
++	-fmerge-all-constants -fno-math-errno \
++	-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
++	HAVE_NEON = 1
++	ARCH = arm
++	ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
++	  CFLAGS += -march=armv7-a
++	else
++	  CFLAGS += -march=armv7ve
++	  # If gcc is 5.0 or later
++	  ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
++	    LDFLAGS += -static-libgcc -static-libstdc++
++	  endif
++	endif
++#######################################
++
++# OS X
++else ifneq (,$(findstring osx,$(platform)))
++   TARGET := $(TARGET_NAME)_libretro.dylib
++   fpic := -fPIC
++   SHARED := -dynamiclib
++
++   ifeq ($(CROSS_COMPILE),1)
++	TARGET_RULE   = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
++	CFLAGS   += $(TARGET_RULE)
++	CPPFLAGS += $(TARGET_RULE)
++	CXXFLAGS += $(TARGET_RULE)
++	LDFLAGS  += $(TARGET_RULE)
++   endif
++
++# iOS
++else ifneq (,$(findstring ios,$(platform)))
++   TARGET := $(TARGET_NAME)_libretro_ios.dylib
++   fpic := -fPIC
++   SHARED := -dynamiclib
++
++ifeq ($(IOSSDK),)
++   IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
++endif
++ifeq ($(platform), ios-arm64)
++  CC = cc -arch arm64 -isysroot $(IOSSDK)
++  CXX = c++ -arch arm64 -isysroot $(IOSSDK)
++else
++  CC = cc -arch armv7 -isysroot $(IOSSDK)
++  CXX = c++ -arch armv7 -isysroot $(IOSSDK)
++endif
++ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
++  CC               += -miphoneos-version-min=8.0
++  CXX              += -miphoneos-version-min=8.0
++else
++  CC               += -miphoneos-version-min=5.0
++  CXX              += -miphoneos-version-min=5.0
++endif
++
++# tvOS
++else ifeq ($(platform), tvos-arm64)
++   TARGET := $(TARGET_NAME)_libretro_tvos.dylib
++   fpic := -fPIC
++   SHARED := -dynamiclib
++
++# CTR (3DS)
++else ifeq ($(platform), ctr)
++	TARGET := $(TARGET_NAME)_libretro_$(platform).a
++	CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
++	CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
++	AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
++	DEFINES += -D_3DS -DARM11 -march=armv6k -mtune=mpcore -mfloat-abi=hard
++	CFLAGS += $(DEFINES)
++	CXXFLAGS += $(DEFINES)
++	STATIC_LINKING = 1
++	STATIC_LINKING_LINK = 1
++
++# GCW0 (OpenDingux and OpenDingux Beta)
++else ifeq ($(platform), gcw0)
++	TARGET := $(TARGET_NAME)_libretro.so
++	CC = /opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc
++	CXX = /opt/gcw0-toolchain/usr/bin/mipsel-linux-g++
++	AR = /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar
++	SHARED := -shared -Wl,--no-undefined -Wl,--version-script=$(CORE_DIR)/libretro/core/link.T
++	fpic := -fPIC
++	CFLAGS += -DDINGUX -fomit-frame-pointer -march=mips32 -mtune=mips32r2 -mhard-float
++
++# Miyoo
++else ifeq ($(platform), miyoo)
++	TARGET := $(TARGET_NAME)_libretro.so
++	CC = /opt/miyoo/usr/bin/arm-linux-gcc
++	CXX = /opt/miyoo/usr/bin/arm-linux-g++
++	AR = /opt/miyoo/usr/bin/arm-linux-ar
++	SHARED := -shared -Wl,--no-undefined -Wl,--version-script=$(CORE_DIR)/libretro/core/link.T
++	fpic := -fPIC
++	CFLAGS += -mcpu=arm926ej-s
++
++# Nintendo Game Cube
++else ifeq ($(platform), ngc)
++   TARGET := $(TARGET_NAME)_libretro_ngc.a
++   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
++   CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
++   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)   
++	BAKE_IN_ZLIB=1
++   CFLAGS += \
++	-DHAVE_ASPRINTF -I$(DEVKITPRO)/libogc/include \
++	-DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float
++   SHARED :=   -lm -lc
++	WANT_ZLIB=1
++	STATIC_LINKING=1
++	STATIC_LINKING_LINK=1
++
++# Nintendo Wii
++else ifeq ($(platform), wii)
++   TARGET := $(TARGET_NAME)_libretro_wii.a
++   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
++   CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
++   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)   
++	BAKE_IN_ZLIB=1
++   CFLAGS += \
++	-DHAVE_ASPRINTF -I$(DEVKITPRO)/libogc/include \
++	-DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
++   SHARED :=   -lm -lc
++	WANT_ZLIB=1
++	STATIC_LINKING=1
++	STATIC_LINKING_LINK=1
++
++else ifeq ($(platform), emscripten)
++   TARGET := $(TARGET_NAME)_libretro_emscripten.bc
++   fpic := -fPIC
++   SHARED := -shared -r
++   STATIC_LINKING=1
++else ifeq ($(platform), libnx)
++    include $(DEVKITPRO)/libnx/switch_rules
++    EXT=a
++    TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
++    DEFINES := -DSWITCH=1 -U__linux__ -U__linux
++    CFLAGS	:=	 $(DEFINES) -g -O3 \
++                 -fPIE -I$(LIBNX)/include/ -ffunction-sections -fdata-sections -ftls-model=local-exec -Wl,--allow-multiple-definition -specs=$(LIBNX)/switch.specs
++    CFLAGS += $(INCDIRS)
++    CFLAGS	+=	-D__SWITCH__ -DHAVE_LIBNX -march=armv8-a -mtune=cortex-a57 -mtp=soft
++    CXXFLAGS := $(ASFLAGS) $(CFLAGS) -fno-rtti -std=gnu++11
++    CFLAGS += -std=gnu11
++	 WANT_ZLIB=1
++	 STATIC_LINKING = 1
++	 STATIC_LINKING_LINK=1
++
++# Nintendo WiiU
++else ifeq ($(platform), wiiu)
++   TARGET := $(TARGET_NAME)_libretro_wiiu.a
++   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
++   CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
++   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)   
++	BAKE_IN_ZLIB=1
++   CFLAGS += \
++	-DHAVE_ASPRINTF -I$(DEVKITPRO)/libogc/include \
++	-DGEKKO -DWIIU -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
++
++   SHARED :=   -lm -lc
++	WANT_ZLIB=1
++	STATIC_LINKING=1
++	STATIC_LINKING_LINK=1
++
++# Nintendo Switch (libtransistor)
++else ifeq ($(platform), switch)
++	EXT=a
++        TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
++        include $(LIBTRANSISTOR_HOME)/libtransistor.mk
++	WANT_ZLIB=1
++        STATIC_LINKING=1
++
++else ifeq ($(platform), psl1ght)
++   TARGET := $(TARGET_NAME)_libretro_$(platform).a
++   CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
++   CXX = $(PS3DEV)/ppu/bin/ppu-g++$(EXE_EXT)
++   CC_AS = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
++   AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
++	BAKE_IN_ZLIB=1
++   SHARED :=   -lm -lc
++   CFLAGS += -DHAVE_ASPRINTF -D__PS3__
++	WANT_ZLIB=1
++	STATIC_LINKING=1
++	STATIC_LINKING_LINK=1
++
++# Vita
++else ifeq ($(platform), vita)
++	TARGET := $(TARGET_NAME)_libretro_$(platform).a
++	CC = arm-vita-eabi-gcc$(EXE_EXT)
++	CXX = arm-vita-eabi-g++$(EXE_EXT)
++	AR = arm-vita-eabi-ar$(EXE_EXT)
++	CFLAGS += -DVITA
++	STATIC_LINKING = 1
++	STATIC_LINKING_LINK=1
++
++# Windows MSVC 2010 x64
++else ifeq ($(platform), windows_msvc2010_x64)
++	CC  = cl.exe
++	CXX = cl.exe
++
++PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin/amd64"):$(PATH)
++PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
++LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64")
++INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
++
++WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
++WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
++
++WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
++WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
++WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\x64")
++
++INCFLAGS_PLATFORM = -I"$(WindowsSDKIncludeDir)"
++export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
++export LIB := $(LIB);$(WindowsSDKLibDir)
++TARGET := $(TARGET_NAME)_libretro.dll
++PSS_STYLE :=2
++LDFLAGS += -DLL
++LIBS =
++# Windows MSVC 2010 x86
++else ifeq ($(platform), windows_msvc2010_x86)
++	CC  = cl.exe
++	CXX = cl.exe
++
++PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin"):$(PATH)
++PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
++LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/lib")
++INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
++
++WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
++WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
++
++WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
++WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
++WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
++
++INCFLAGS_PLATFORM = -I"$(WindowsSDKIncludeDir)"
++export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
++export LIB := $(LIB);$(WindowsSDKLibDir)
++TARGET := $(TARGET_NAME)_libretro.dll
++PSS_STYLE :=2
++LDFLAGS += -DLL
++LIBS =
++PLATFLAGS := -DWIN32
++
++# Windows MSVC 2005 x86
++else ifeq ($(platform), windows_msvc2005_x86)
++	CC  = cl.exe
++	CXX = cl.exe
++
++PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH)
++PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
++INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/include")
++LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib")
++BIN := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin")
++
++WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" -v "Install Dir" | grep -o '[A-Z]:\\.*')
++
++WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
++WindowsSDKAtlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\atl")
++WindowsSDKCrtIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\crt")
++WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
++WindowsSDKMfcIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\mfc")
++WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
++
++export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro-common/include/compat/msvc
++export LIB := $(LIB);$(WindowsSDKLibDir)
++TARGET := $(TARGET_NAME)_libretro.dll
++PSS_STYLE :=2
++LDFLAGS += -DLL
++CFLAGS += -D_CRT_SECURE_NO_DEPRECATE
++
++# Windows MSVC 2017 all architectures
++else ifneq (,$(findstring windows_msvc2017,$(platform)))
++
++    NO_GCC := 1
++    CFLAGS += -DNOMINMAX
++    CXXFLAGS += -DNOMINMAX
++    WINDOWS_VERSION = 1
++
++	PlatformSuffix = $(subst windows_msvc2017_,,$(platform))
++	ifneq (,$(findstring desktop,$(PlatformSuffix)))
++		WinPartition = desktop
++		MSVC2017CompileFlags = -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -FS
++		LDFLAGS += -MANIFEST -LTCG:incremental -NXCOMPAT -DYNAMICBASE -DEBUG -OPT:REF -INCREMENTAL:NO -SUBSYSTEM:WINDOWS -MANIFESTUAC:"level='asInvoker' uiAccess='false'" -OPT:ICF -ERRORREPORT:PROMPT -NOLOGO -TLBID:1
++		LIBS += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
++	else ifneq (,$(findstring uwp,$(PlatformSuffix)))
++		WinPartition = uwp
++		MSVC2017CompileFlags = -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_WINDLL -D_UNICODE -DUNICODE -D__WRL_NO_DEFAULT_LIB__ -EHsc -FS
++		LDFLAGS += -APPCONTAINER -NXCOMPAT -DYNAMICBASE -MANIFEST:NO -LTCG -OPT:REF -SUBSYSTEM:CONSOLE -MANIFESTUAC:NO -OPT:ICF -ERRORREPORT:PROMPT -NOLOGO -TLBID:1 -DEBUG:FULL -WINMD:NO
++		LIBS += WindowsApp.lib
++	endif
++
++	CFLAGS += $(MSVC2017CompileFlags)
++	CXXFLAGS += $(MSVC2017CompileFlags)
++
++	TargetArchMoniker = $(subst $(WinPartition)_,,$(PlatformSuffix))
++
++	CC  = cl.exe
++	CXX = cl.exe
++	LD = link.exe
++
++	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)%")
++	ProgramFiles86 := $(shell cygpath "$(ProgramFiles86w)")
++
++	WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
++	WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
++	WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
++	WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
++	WindowsSdkDir := $(WindowsSdkDir)
++
++	WindowsSDKVersion ?= $(firstword $(foreach folder,$(subst $(subst \,/,$(WindowsSdkDir)Include/),,$(wildcard $(call fix_path,$(WindowsSdkDir)Include\*))),$(if $(wildcard $(call fix_path,$(WindowsSdkDir)Include/$(folder)/um/Windows.h)),$(folder),)))$(BACKSLASH)
++	WindowsSDKVersion := $(WindowsSDKVersion)
++
++	VsInstallBuildTools = $(ProgramFiles86)/Microsoft Visual Studio/2017/BuildTools
++	VsInstallEnterprise = $(ProgramFiles86)/Microsoft Visual Studio/2017/Enterprise
++	VsInstallProfessional = $(ProgramFiles86)/Microsoft Visual Studio/2017/Professional
++	VsInstallCommunity = $(ProgramFiles86)/Microsoft Visual Studio/2017/Community
++
++	VsInstallRoot ?= $(shell if [ -d "$(VsInstallBuildTools)" ]; then echo "$(VsInstallBuildTools)"; fi)
++	ifeq ($(VsInstallRoot), )
++		VsInstallRoot = $(shell if [ -d "$(VsInstallEnterprise)" ]; then echo "$(VsInstallEnterprise)"; fi)
++	endif
++	ifeq ($(VsInstallRoot), )
++		VsInstallRoot = $(shell if [ -d "$(VsInstallProfessional)" ]; then echo "$(VsInstallProfessional)"; fi)
++	endif
++	ifeq ($(VsInstallRoot), )
++		VsInstallRoot = $(shell if [ -d "$(VsInstallCommunity)" ]; then echo "$(VsInstallCommunity)"; fi)
++	endif
++	VsInstallRoot := $(VsInstallRoot)
++
++	VcCompilerToolsVer := $(shell cat "$(VsInstallRoot)/VC/Auxiliary/Build/Microsoft.VCToolsVersion.default.txt" | grep -o '[0-9\.]*')
++	VcCompilerToolsDir := $(VsInstallRoot)/VC/Tools/MSVC/$(VcCompilerToolsVer)
++
++	WindowsSDKSharedIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\shared")
++	WindowsSDKUCRTIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\ucrt")
++	WindowsSDKUMIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\um")
++	WindowsSDKUCRTLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\$(WindowsSDKVersion)\ucrt\$(TargetArchMoniker)")
++	WindowsSDKUMLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\$(WindowsSDKVersion)\um\$(TargetArchMoniker)")
++
++	# For some reason the HostX86 compiler doesn't like compiling for x64
++	# ("no such file" opening a shared library), and vice-versa.
++	# Work around it for now by using the strictly x86 compiler for x86, and x64 for x64.
++	# NOTE: What about ARM?
++	ifneq (,$(findstring x64,$(TargetArchMoniker)))
++		VCCompilerToolsBinDir := $(VcCompilerToolsDir)\bin\HostX64
++	else
++		VCCompilerToolsBinDir := $(VcCompilerToolsDir)\bin\HostX86
++	endif
++
++	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 "$(LIB)/store")
++	endif
++    
++	export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)
++	export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir)
++	TARGET := $(TARGET_NAME)_libretro.dll
++	PSS_STYLE :=2
++	LDFLAGS += -DLL
++
++# Windows
++else
++	CC ?= gcc
++   PLATFLAGS := -DWIN32
++   TARGET := $(TARGET_NAME)_libretro.dll
++   SHARED := -shared -static-libgcc -s -Wl,--version-script=$(CORE_DIR)/libretro/core/link.T -Wl,--no-undefined 
++endif
++
++ifeq ($(STATIC_LINKING),1)
++SHARED=
++fpic=
++endif
++
++ifeq ($(DEBUG), 1)
++   CFLAGS += -O0 -g
++else
++   CFLAGS += -O2 -DNDEBUG
++endif
++
++ifneq (,$(findstring msvc,$(platform)))
++ifeq ($(DEBUG),1)
++   CFLAGS += -MTd
++else
++   CFLAGS += -MT
++endif
++endif
++
++ifeq ($(WANT_ZLIB), 1)
++CFLAGS += -DWANT_ZLIB
++endif
++
++ifeq (,$(findstring msvc,$(platform)))
++CFLAGS += -fsigned-char -Wno-strict-prototypes -ffast-math -fomit-frame-pointer -fno-builtin
++endif
++
++include $(CORE_DIR)/Makefile.common
++
++ifeq ($(STATIC_LINKING),1)
++CFLAGS   += -DSTATIC_LINKING
++endif
++
++INCFLAGS_PLATFORM += -D__LIBRETRO__
++
++CFLAGS   += $(INCFLAGS) $(INCFLAGS_PLATFORM)
++CXXFLAGS +=	$(CFLAGS) $(INCFLAGS) $(INCFLAGS_PLATFORM)
++CPPFLAGS += $(CFLAGS) $(INCFLAGS) $(INCFLAGS_PLATFORM)
++
++ifeq (,$(findstring msvc,$(platform)))
++CFLAGS += -DINLINE="inline"
++CXXFLAGS += -DINLINE="inline"
++LIBS := -lm
++else
++CFLAGS += -DINLINE="_inline"
++CXXFLAGS += -DINLINE="_inline"
++endif
++
++OBJECTS := $(SOURCES_C:.c=.o)
++
++OBJOUT   = -o
++LINKOUT  = -o 
++
++ifneq (,$(findstring msvc,$(platform)))
++	OBJOUT = -Fo
++	LINKOUT = -out:
++	LD = link.exe
++else
++	LD = $(CC)
++endif
++
++all: $(TARGET)
++$(TARGET): $(OBJECTS)
++ifeq ($(STATIC_LINKING_LINK),1)
++	$(AR) rcs $@ $(OBJECTS) 
++else
++	$(LD) $(LINKOUT)$@ $(fpic) $(SHARED) $(OBJECTS) $(LDFLAGS) $(LIBS)
++endif
++
++%.o: %.c
++	$(CC) $(CFLAGS) $(fpic) $(PLATFLAGS) -c $(OBJOUT)$@ $<
++
++clean:
++	rm -f $(OBJECTS) $(TARGET) 
++
++.PHONY: clean
++
diff --git a/games/libretro-xrick/files/patch-Makefile.libretro b/games/libretro-xrick/files/patch-Makefile.libretro
deleted file mode 100644
index 57601b18ecc2..000000000000
--- a/games/libretro-xrick/files/patch-Makefile.libretro
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.libretro.orig	2020-10-07 22:50:55 UTC
-+++ Makefile.libretro
-@@ -39,7 +39,7 @@ ifeq ($(platform), android)
-    SHARED :=  -Wl,--fix-cortex-a8 -llog --shared -Wl,--version-script=$(CORE_DIR)/libretro/core/link.T -Wl,--no-undefined
- 
- else ifeq ($(platform), unix)
--   CC = gcc
-+   CC?= gcc
-  TARGET := $(TARGET_NAME)_libretro.so
-    fpic := -fPIC
-    ifneq ($(findstring SunOS,$(shell uname -a)),)