From 10cd3b0d2c606553623019e1107ec4370febff26 Mon Sep 17 00:00:00 2001
From: natinusala <natinusala@gmail.com>
Date: Wed, 30 Jan 2019 19:10:44 +0100
Subject: [PATCH 1/2] Add assets to the gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7cb4fe57f0..e5cd6047cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@ libretro-super
 run.sh
 convert_rumble.awk
 *~
+assets
 
 # Wii U
 *.depend

From c0dde586a00824a3799dee52676480e6a01a2b77 Mon Sep 17 00:00:00 2001
From: natinusala <natinusala@gmail.com>
Date: Wed, 30 Jan 2019 19:11:11 +0100
Subject: [PATCH 2/2] libnx: Remove HAVE_CHD due to static conflicts between
 different cores

---
 Makefile.libnx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.libnx b/Makefile.libnx
index 566730ecb3..a15b596cde 100644
--- a/Makefile.libnx
+++ b/Makefile.libnx
@@ -41,7 +41,7 @@ HAVE_NETWORKING = 1
 HAVE_NETPLAYDISCOVERY = 1
 HAVE_STB_FONT = 1
 HAVE_CHEEVOS = 1
-HAVE_CHD = 1
+HAVE_CHD = 0 # disabled due to static libretro-common and libchdr conflicts between different cores
 HAVE_STB_VORBIS = 1
 
 # RetroArch libnx useful flags