Update DosBox core

This commit is contained in:
Ehmry - 2019-03-03 12:54:58 +01:00
parent e8a55e2d8c
commit 869a9459e6
5 changed files with 12 additions and 7 deletions

2
.gitmodules vendored
View File

@ -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

View File

@ -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}

View File

@ -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@

@ -1 +0,0 @@
Subproject commit 2f4abd2432a4c17627b84417685ee35c8d8c9afe

@ -0,0 +1 @@
Subproject commit 8a73b1ef6606743641c027f86e78ee9514ed1554