From 413e9d5c3e5668004f6a3f62f2bfce9e608982de Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 7 Sep 2019 20:47:29 +0200
Subject: [PATCH] Add bsnes hd rule

---
 build-config.sh       |  1 +
 libretro-build.sh     |  6 ++++++
 rules.d/core-rules.sh | 11 +++++++++++
 3 files changed, 18 insertions(+)

diff --git a/build-config.sh b/build-config.sh
index 2fdef6be..fc388a8d 100644
--- a/build-config.sh
+++ b/build-config.sh
@@ -17,6 +17,7 @@ include_core_snes9x2002
 include_core_snes9x2005
 include_core_snes9x2010
 include_core_snes9x
+include_core_bsnes_hd
 include_core_bsnes_accuracy
 include_core_bsnes_balanced
 include_core_bsnes_performance
diff --git a/libretro-build.sh b/libretro-build.sh
index 3c8d9fb5..e20a12d7 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -25,6 +25,7 @@ if [ "$HOST_CC" ]; then
 	CC="${HOST_CC}-gcc"
 	CXX="${HOST_CC}-g++"
 	CXX11="${HOST_CC}-g++"
+	CXX17="${HOST_CC}-g++"
 	STRIP="${HOST_CC}-strip"
 fi
 
@@ -56,18 +57,22 @@ if [ -z "$CXX" ]; then
 	if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
 		CXX=c++
 		CXX11="clang++ -std=c++11 -stdlib=libc++"
+		CXX17="clang++ -std=c++17 -stdlib=libc++"
 		# FIXME: Do this right later.
 		if [ "$ARCH" = "i386" ]; then
 			CC="cc -arch i386"
 			CXX="c++ -arch i386"
 			CXX11="clang++ -arch i386 -std=c++11 -stdlib=libc++"
+			CXX17="clang++ -arch i386 -std=c++17 -stdlib=libc++"
 		fi
 	elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
 		CXX=mingw32-g++
 		CXX11=mingw32-g++
+		CXX17=mingw32-g++
 	else
 		CXX=g++
 		CXX11=g++
+		CXX17=g++
 	fi
 fi
 
@@ -76,6 +81,7 @@ FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET
 echo "CC = $CC"
 echo "CXX = $CXX"
 echo "CXX11 = $CXX11"
+echo "CXX17 = $CXX17"
 echo "STRIP = $STRIP"
 
 . "$BASE_DIR/libretro-build-common.sh"
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index ebbeeaae..12b4c302 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -1,5 +1,16 @@
 # vim: set ts=3 sw=3 noet ft=sh : bash
 
+include_core_bsnes_hd() {
+	register_module core "bsnes_hd" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
+}
+
+libretro_bsnes_hd_name="bsnes HD"
+libretro_bsnes_hd_git_url="https://github.com/libretro/bsnes.git"
+libretro_bsnes_hd_build_args="compiler=\"${CXX17}\" target=\"libretro\""
+libretro_bsnes_hd_build_subdir="bsnes"
+libretro_bsnes_hd_build_makefile="GNUmakefile"
+libretro_bsnes_hd_build_products="out"
+
 include_core_bsnes_accuracy() {
 	register_module core "bsnes_accuracy" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
 }