From 869a9459e6ee1fffec187d5dfadd31591ec0674e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 3 Mar 2019 12:54:58 +0100 Subject: [PATCH] Update DosBox core --- .gitmodules | 2 +- libretro/cores/dosbox/Tuprules.tup | 14 ++++++++++---- libretro/cores/dosbox/archives | 1 - libretro/cores/dosbox/core | 1 - libretro/cores/dosbox/upstream | 1 + 5 files changed, 12 insertions(+), 7 deletions(-) delete mode 160000 libretro/cores/dosbox/core create mode 160000 libretro/cores/dosbox/upstream diff --git a/.gitmodules b/.gitmodules index d21e43c76..b026dddec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,7 +50,7 @@ path = libretro/cores/samples/upstream url = https://github.com/libretro/libretro-samples [submodule "libretro/cores/dosbox/core"] - path = libretro/cores/dosbox/core + path = libretro/cores/dosbox/upstream url = https://github.com/libretro/dosbox-libretro [submodule "libretro/cores/mrboom/core"] path = libretro/cores/mrboom/core diff --git a/libretro/cores/dosbox/Tuprules.tup b/libretro/cores/dosbox/Tuprules.tup index b0daaa2f5..757248691 100644 --- a/libretro/cores/dosbox/Tuprules.tup +++ b/libretro/cores/dosbox/Tuprules.tup @@ -1,15 +1,21 @@ -CORE_PKGS += stdcxx +CORE_PKGS += stdcxx libm +NO_UNDEFINED = + # Uses Genode API to create secondary stack WITH_DYNAREC = @(TUP_ARCH) # TODO: will not configure correctly for every possible TUP_ARCH -include core/Makefile.common +include upstream/Makefile.common SOURCES_CXX += $(CORE_DIR)/libretro-common/libco/genode.cpp GIT_VERSION = `git describe --always` CFLAGS += -O2 -DNDEBUG -DGIT_VERSION=\"$(GIT_VERSION)\" -D__GENODE__ +CFLAGS += $(COMMONFLAGS) + +CXXFLAGS += -DHAVE_MMAP + # Use anonymous mmap to allocate executable memory pages : foreach $(SOURCES_C) |> !libretro_cc |> {libretro_objs} : foreach $(SOURCES_CXX) |> !libretro_cxx |> {libretro_objs} @@ -17,8 +23,8 @@ CFLAGS += -O2 -DNDEBUG -DGIT_VERSION=\"$(GIT_VERSION)\" -D__GENODE__ : {libretro_objs} |> !libretro_core_link |> {core} : {core} |> !publish_core |> {binary} -: $(TUP_CWD)/archives |> !publish_core_archives |> {package} -: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package} +: $(TUP_CWD)/archives | {core} |> !publish_core_archives |> {package} +: $(TUP_CWD)/runtime | {core} |> !publish_core_runtime |> {package} ifdef DEPOT_KEY : {binary} |> !depot_bin_tarball |> {tarballs} diff --git a/libretro/cores/dosbox/archives b/libretro/cores/dosbox/archives index 2aaf09d8b..7401911c7 100644 --- a/libretro/cores/dosbox/archives +++ b/libretro/cores/dosbox/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-dosbox/@DEPOT_VERSION@ diff --git a/libretro/cores/dosbox/core b/libretro/cores/dosbox/core deleted file mode 160000 index 2f4abd243..000000000 --- a/libretro/cores/dosbox/core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2f4abd2432a4c17627b84417685ee35c8d8c9afe diff --git a/libretro/cores/dosbox/upstream b/libretro/cores/dosbox/upstream new file mode 160000 index 000000000..8a73b1ef6 --- /dev/null +++ b/libretro/cores/dosbox/upstream @@ -0,0 +1 @@ +Subproject commit 8a73b1ef6606743641c027f86e78ee9514ed1554