Merge branch 'master' of github.com:libretro/libretro-super

.gitignore

@@ -63,6 +63,12 @@
 /libretro-fuse/
 /libretro-lutro/
 /libretro-gw/
+/libretro-cap32/
+/libretro-lutro_game_of_life/
+/libretro-lutro_iyfct/
+/libretro-lutro_platformer/
+/libretro-lutro_snake/
+/libretro-lutro_tetris/
 /libretro-devkit/
 /retroarch/
 /build-summary.log

dist/info/mgba_libretro.info

@@ -0,0 +1,12 @@
+display_name = "Game Boy Advance (mGBA)"
+authors = "Jeffrey Pfau"
+supported_extensions = "gba|bin"
+corename = "mGBA"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Game Boy Advance"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+license = "MPLv2.0"
+permissions = ""
+display_version = "Git"
+supports_no_game = "false"

libretro-build-common.sh

@@ -3,6 +3,7 @@
 . "$BASE_DIR/script-modules/util.sh"
 . "$BASE_DIR/script-modules/fetch-rules.sh"
 . "$BASE_DIR/script-modules/cpu.sh"
+. "$BASE_DIR/script-modules/modules.sh"
 
 . "$BASE_DIR/rules.d/core-rules.sh"
 

libretro-build.sh

@@ -178,7 +178,6 @@ else
 	build_libretro_emux
 	libretro_build_core fuse
 	libretro_build_core stonesoup
-	libretro_build_core nxengine
 	libretro_build_core gw
 	libretro_build_core lutro