mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8129 from natinusala/master

Browse Source 
libnx: remove HAVE_CHD + add assets to the gitignore
This commit is contained in:
Twinaphex 2019-01-30 20:51:51 +01:00 committed by GitHub
commit 81bca39b53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -76,6 +76,7 @@ libretro-super
run.sh run.sh
convert_rumble.awk convert_rumble.awk
*~ *~
assets
# Wii U # Wii U
*.depend *.depend

2
Makefile.libnx
View File

@ -41,7 +41,7 @@ HAVE_NETWORKING = 1
HAVE_NETPLAYDISCOVERY = 1 HAVE_NETPLAYDISCOVERY = 1
HAVE_STB_FONT = 1 HAVE_STB_FONT = 1
HAVE_CHEEVOS = 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 HAVE_STB_VORBIS = 1
# RetroArch libnx useful flags # RetroArch libnx useful flags