From 6214718412af0ac9d382f0cb6b2b401e19c5515f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 3 Mar 2019 14:09:45 +0100 Subject: [PATCH] Update MGBA core --- .gitmodules | 2 +- libretro/cores/mgba/Tuprules.tup | 4 ++-- libretro/cores/mgba/archives | 1 - libretro/cores/mgba/core | 1 - libretro/cores/mgba/upstream | 1 + 5 files changed, 4 insertions(+), 5 deletions(-) delete mode 160000 libretro/cores/mgba/core create mode 160000 libretro/cores/mgba/upstream diff --git a/.gitmodules b/.gitmodules index b36d0d4..c40f251 100644 --- a/.gitmodules +++ b/.gitmodules @@ -32,7 +32,7 @@ path = libretro/cores/fceumm/upstream url = https://github.com/libretro/libretro-fceumm [submodule "libretro/cores/mgba/core"] - path = libretro/cores/mgba/core + path = libretro/cores/mgba/upstream url = https://github.com/libretro/mgba [submodule "libretro/cores/nxengine/core"] path = libretro/cores/nxengine/core diff --git a/libretro/cores/mgba/Tuprules.tup b/libretro/cores/mgba/Tuprules.tup index c688243..16b7b9d 100644 --- a/libretro/cores/mgba/Tuprules.tup +++ b/libretro/cores/mgba/Tuprules.tup @@ -1,4 +1,4 @@ -CORE_PKGS += libc +CORE_PKGS += libc libm GIT_VERSION = `git describe --always` CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" @@ -6,7 +6,7 @@ CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" CFLAGS += -O3 CFLAGS += -DHAVE_STRNDUP -DHAVE_STRDUP -DDISABLE_THREADING -include core/libretro-build/Makefile.common +include upstream/libretro-build/Makefile.common CFLAGS += $(RETRODEFS) CFLAGS += $(INCLUDES) diff --git a/libretro/cores/mgba/archives b/libretro/cores/mgba/archives index 87a6e62..7401911 100644 --- a/libretro/cores/mgba/archives +++ b/libretro/cores/mgba/archives @@ -2,4 +2,3 @@ @SDK_USER@/src/libc/@SDK_VERSION@ @SDK_USER@/src/stdcxx/@SDK_VERSION@ @DEPOT_USER@/src/retro_frontend/@DEPOT_VERSION@ -@DEPOT_USER@/src/libretro-mgba/@DEPOT_VERSION@ diff --git a/libretro/cores/mgba/core b/libretro/cores/mgba/core deleted file mode 160000 index 5ca6239..0000000 --- a/libretro/cores/mgba/core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5ca62390ea837d9c48aa0d87a5a8a9b545ad34b8 diff --git a/libretro/cores/mgba/upstream b/libretro/cores/mgba/upstream new file mode 160000 index 0000000..443d672 --- /dev/null +++ b/libretro/cores/mgba/upstream @@ -0,0 +1 @@ +Subproject commit 443d67232b50dee7643b4084f1234f2c7a7c691e