diff --git a/.gitmodules b/.gitmodules index b863d47..5996cbc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "libretro/libretro-common"] - path = libretro/libretro-common + path = libretro-common url = https://github.com/libretro/libretro-common.git [submodule "libretro/retro_frontend"] - path = libretro/retro_frontend + path = retro_frontend url = git://depot.h4ck.me/srv/git/retro_frontend [submodule "libretro/cores/2048/core"] - path = libretro/cores/2048/upstream + path = cores/2048/upstream url = https://github.com/libretro/libretro-2048 [submodule "libretro/cores/4do/core"] - path = libretro/cores/4do/upstream + path = cores/4do/upstream url = https://github.com/libretro/4do-libretro.git [submodule "libretro/cores/fceumm/core"] - path = libretro/cores/fceumm/upstream + path = cores/fceumm/upstream url = https://github.com/libretro/libretro-fceumm.git [submodule "libretro/cores/mgba/core"] - path = libretro/cores/mgba/upstream + path = cores/mgba/upstream url = https://github.com/libretro/mgba.git [submodule "libretro/cores/nxengine/core"] - path = libretro/cores/nxengine/upstream + path = cores/nxengine/upstream url = git://depot.h4ck.me/srv/git/nxengine [submodule "libretro/cores/oberon/core"] - path = libretro/cores/oberon/upstream + path = cores/oberon/upstream url = git@github.com:ehmry/oberon-risc-libretro.git [submodule "libretro/cores/snes9x/core"] - path = libretro/cores/snes9x/upstream + path = cores/snes9x/upstream url = https://github.com/libretro/snes9x.git [submodule "libretro/cores/tyrquake/core"] - path = libretro/cores/tyrquake/upstream + path = cores/tyrquake/upstream url = https://github.com/libretro/tyrquake [submodule "libretro/cores/samples"] - path = libretro/cores/samples/upstream + path = cores/samples/upstream url = https://github.com/libretro/libretro-samples [submodule "libretro/cores/dosbox/core"] - path = libretro/cores/dosbox-libretro/upstream + path = cores/dosbox-libretro/upstream url = https://github.com/libretro/dosbox-libretro [submodule "libretro/cores/mrboom/core"] - path = libretro/cores/mrboom/upstream + path = cores/mrboom/upstream url = git@github.com:ehmry/mrboom-libretro.git [submodule "libretro/cores/gambatte/core"] - path = libretro/cores/gambatte/upstream + path = cores/gambatte/upstream url = git@github.com:github.com/ehmry/gambatte-libretro.git [submodule "libretro/cores/dinothawr/core"] - path = libretro/cores/dinothawr/core + path = cores/dinothawr/core url = https://github.com/libretro/Dinothawr [submodule "libretro/cores/scummvm/upstream"] path = libretro/cores/scummvm/upstream url = https://github.com/libretro/scummvm.git [submodule "libretro/cores/lutro/upstream"] - path = libretro/cores/lutro/upstream + path = cores/lutro/upstream url = git@github.com:ehmry/libretro-lutro.git [submodule "libretro/cores/bluemsx/upstream"] - path = libretro/cores/bluemsx/upstream + path = cores/bluemsx/upstream url = git@github.com:ehmry/blueMSX-libretro.git [submodule "libretro/bios/cbios-cbios"] - path = libretro/bios/cbios-cbios + path = bios/cbios-cbios url = https://git.code.sf.net/p/cbios/cbios [submodule "libretro/cores/mu/upstream"] - path = libretro/cores/mu/upstream + path = cores/mu/upstream url = https://github.com/meepingsnesroms/Mu.git [submodule "libretro/cores/dosbox-svn/upstream"] - path = libretro/cores/dosbox-svn/upstream + path = cores/dosbox-svn/upstream url = https://github.com/libretro/dosbox-svn.git [submodule "libretro/cores/yabause/upstream"] - path = libretro/cores/yabause/upstream + path = cores/yabause/upstream url = https://github.com/libretro/yabause.git diff --git a/libretro/README.md b/README.md similarity index 100% rename from libretro/README.md rename to README.md diff --git a/Tuprules.tup b/Tuprules.tup index acfa655..9643f1c 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -29,12 +29,9 @@ ifeq (@(TUP_ARCH),arm_v8) CC_MARCH = -march=armv8-a endif -GENODE_DIR = $(TUP_CWD) - LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name` -!prg = | $(GENODE_DIR)/ $(GENODE_DIR)/ \ -|> ^o LD %o^ \ +!prg = |> ^o LD %o^ \ $(LD) $(LD_MARCH) $(LDFLAGS) \ %f \ `$(PKG_CONFIG) --libs $(LIBS) genode-prg` \ @@ -42,7 +39,8 @@ LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name` -o %o \ |> %d -!lib = | $(GENODE_DIR)/ $(GENODE_DIR)/ |> ^o LD %o^ $(LD) $(LD_MARCH) %f $(LDFLAGS) `$(PKG_CONFIG) --libs genode-lib $(LIBS)` -o %o |> +!lib = |> ^o LD %o^ \ + $(LD) $(LD_MARCH) %f $(LDFLAGS) `$(PKG_CONFIG) --libs genode-lib $(LIBS)` -o %o |> ifeq ($(RAW_NAME),) RAW_NAME = $(TARGET_NAME) @@ -99,15 +97,11 @@ PKG_CONFIG = pkg-config !asm = |> ^ CC %b^ @(CC_WRAPPER) $(CC) $(DEFINES) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) -D__ASSEMBLY__ $(INCLUDES) -c %f -o %o |> %B.o -!cc = | $(GENODE_DIR)/ |> ^o CC %f^ @(CC_WRAPPER) $(CC) $(DEFINES) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` $(INCLUDES) -c -fPIC -g %f -o %o |> %B.o +!cc = |> ^o CC %f^ @(CC_WRAPPER) $(CC) $(DEFINES) $(CFLAGS) $(CFLAGS_%e) $(CFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` $(INCLUDES) -c -fPIC -g %f -o %o |> %B.o -!cc_port = | $(GENODE_DIR)/ |> ^o CC %o^ @(CC_WRAPPER) $(CC) $(DEFINES) $(CFLAGS) $(CFLAGS_%o) $(INCLUDES) `$(PKG_CONFIG) --cflags $(LIBS) $(LIBS_CFLAGS)` -c -fPIC -g -o %o |> %B.o +!cxx = |> ^o CXX %b^ @(CC_WRAPPER) $(CXX) $(DEFINES) $(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS)` $(INCLUDES) -c -fPIC -g %f -o %o |> %B.o -!cxx = | $(GENODE_DIR)/ |> ^o CXX %b^ @(CC_WRAPPER) $(CXX) $(DEFINES) $(CXXFLAGS) $(CXXFLAGS_%e) $(CXXFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS)` $(INCLUDES) -c -fPIC -g %f -o %o |> %B.o - -!cxx_port = | $(GENODE_DIR)/ |> ^o CXX %o^ @(CC_WRAPPER) $(CXX) $(DEFINES) $(CXXFLAGS) $(CXXFLAGS_%f) `$(PKG_CONFIG) --cflags $(LIBS)` $(INCLUDES) -c -fPIC -g -o %o |> %B.o - -!ld = | $(GENODE_DIR)/ $(GENODE_DIR)/ |> ^o LD %o^ $(LD) $(LDFLAGS) `$(PKG_CONFIG) --libs $(LIBS)` --whole-archive --start-group %f --no-whole-archive --end-group -o %o |> +!ld = |> ^o LD %o^ $(LD) $(LDFLAGS) `$(PKG_CONFIG) --libs $(LIBS)` --whole-archive --start-group %f --no-whole-archive --end-group -o %o |> !strip = |> strip -o %o %f |> @@ -128,10 +122,14 @@ DHALL = dhall !index_pkg = |> |> !render_runtime = | $(VERSIONS_SED_FILE) |> ^o render %d runtime^ \ - $(DHALL) --explain text <<< '$(ERRATA_DIR)/renderRuntime.dhall (%f).runtime' \ - > $(OUT_PKG_DIR)/$(PKG_NAME)/current/runtime; \ - xmllint --noout -schema $(ERRATA_DIR)/runtime.xsd - \ - < $(OUT_PKG_DIR)/$(PKG_NAME)/current/runtime; \ + echo '$(ERRATA_DIR)/renderRuntime.dhall (%f).runtime' \ + | $(DHALL) text \ + | xmllint --format -schema $(ERRATA_DIR)/runtime.xsd - \ + > %o; \ |> \ $(OUT_PKG_DIR)/$(PKG_NAME)/current/runtime \ $(OUT_PKG_DIR)/ \ + +LIBRETRO_COMM_DIR = $(TUP_CWD)/libretro-common +GIT_VERSION = `git describe --always` +BIN_VERSION = $(GIT_VERSION) diff --git a/libretro/bios/cbios-cbios b/bios/cbios-cbios similarity index 100% rename from libretro/bios/cbios-cbios rename to bios/cbios-cbios diff --git a/libretro/cores/2048/Tuprules.tup b/cores/2048/Tuprules.tup similarity index 100% rename from libretro/cores/2048/Tuprules.tup rename to cores/2048/Tuprules.tup diff --git a/libretro/cores/2048/pkg.dhall b/cores/2048/pkg.dhall similarity index 100% rename from libretro/cores/2048/pkg.dhall rename to cores/2048/pkg.dhall diff --git a/libretro/cores/2048/upstream b/cores/2048/upstream similarity index 100% rename from libretro/cores/2048/upstream rename to cores/2048/upstream diff --git a/libretro/cores/4do/Tuprules.tup b/cores/4do/Tuprules.tup similarity index 100% rename from libretro/cores/4do/Tuprules.tup rename to cores/4do/Tuprules.tup diff --git a/cores/4do/pkg.dhall b/cores/4do/pkg.dhall new file mode 100644 index 0000000..3ff8837 --- /dev/null +++ b/cores/4do/pkg.dhall @@ -0,0 +1,12 @@ +let Genode = env:DHALL_GENODE + +let defaults = ./../../pkgJoypadDefaults.dhall + +in { indexInfo = + "3DO Emulator" + , runtime = + defaults.runtime + ⫽ { resources = + { caps = 128, ram = Genode.units.MiB 16 } + } + } diff --git a/libretro/cores/4do/upstream b/cores/4do/upstream similarity index 100% rename from libretro/cores/4do/upstream rename to cores/4do/upstream diff --git a/libretro/cores/README.md b/cores/README.md similarity index 100% rename from libretro/cores/README.md rename to cores/README.md diff --git a/cores/REminiscense/Tuprules.tup b/cores/REminiscense/Tuprules.tup new file mode 100644 index 0000000..bb93ebc --- /dev/null +++ b/cores/REminiscense/Tuprules.tup @@ -0,0 +1,24 @@ +CORE_PKGS += stdcxx libc libm +NO_UNDEFINED = + +DEBUG = 0 +FRONTEND_SUPPORTS_RGB565 = 1 +WANT_MODPLUG = 1 +LIBRETRO_COMM_DIR= + +include upstream/Makefile.common + +: foreach $(SOURCES_C) |> !libretro_cc |> {objs} +: foreach $(SOURCES_CXX) |> !libretro_cxx |> {objs} + +: {objs} |> !libretro_core_link |> {core} +: {core} |> !collect_bin |> +: |> !bin |> + +PKG_DEPENDS += \ + @(PUBLIC_SRC_STDCXX) \ + +: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime} +: |> !pkg |> + +: $(TUP_CWD)/pkg.dhall |> !index_pkg |> diff --git a/cores/REminiscense/pkg.dhall b/cores/REminiscense/pkg.dhall new file mode 100644 index 0000000..612368b --- /dev/null +++ b/cores/REminiscense/pkg.dhall @@ -0,0 +1,15 @@ +let Genode = env:DHALL_GENODE + +let XML = Genode.Prelude.XML + +let defaults = ./../../pkgJoypadDefaults.dhall + +in defaults + ⫽ { indexInfo = + "Port of Gregory Montoir's Flashback emulator, running as a libretro core" + , runtime = + defaults.runtime + ⫽ { roms = + defaults.runtime.roms # [ "stdcxx.lib.so" ] + } + } diff --git a/libretro/cores/Tuprules.tup b/cores/Tuprules.tup similarity index 69% rename from libretro/cores/Tuprules.tup rename to cores/Tuprules.tup index 6a0713a..7581bf2 100644 --- a/libretro/cores/Tuprules.tup +++ b/cores/Tuprules.tup @@ -5,7 +5,7 @@ PKG_DEPENDS += \ _/src/$(BIN_NAME) \ _/src/retro_frontend \ -!libretro_cc = | $(GENODE_DIR)/ |> ^ CC %f^ \ +!libretro_cc = |> ^ CC %f^ \ $(CC) \ $(DEFINES) \ `$(PKG_CONFIG) --cflags $(CORE_PKGS)` \ @@ -13,7 +13,7 @@ PKG_DEPENDS += \ -c %f -o %o \ |> %f.$(TARGET_NAME).o -!libretro_cxx = | $(GENODE_DIR)/ |> ^ CXX %f^ \ +!libretro_cxx = |> ^ CXX %f^ \ $(CXX) \ $(DEFINES) \ `$(PKG_CONFIG) --cflags $(CORE_PKGS)` \ @@ -21,12 +21,11 @@ PKG_DEPENDS += \ -c %f -o %o \ |> %f.$(TARGET_NAME).o -!libretro_core_link = | $(GENODE_DIR)/ $(GENODE_DIR)/ |> ^o LD %d^ \ +!libretro_core_link = |> ^o LD %d^ \ $(LD) %f -o %o \ -shared --version-script=$(LINK_T) $(NO_UNDEFINED) \ $(LDFLAGS) \ - `$(PKG_CONFIG) --libs $(CORE_PKGS)` \ - `$(PKG_CONFIG) --libs genode-lib` \ + `$(PKG_CONFIG) --libs $(CORE_PKGS) genode-lib` \ |> libretro.so LINK_T = $(TUP_CWD)/link.T diff --git a/cores/beetle-psx/Tuprules.tup b/cores/beetle-psx/Tuprules.tup new file mode 100644 index 0000000..8b66be1 --- /dev/null +++ b/cores/beetle-psx/Tuprules.tup @@ -0,0 +1,52 @@ +CORE_PKGS += stdcxx libc libm +NO_UNDEFINED = + +FRONTEND_SUPPORTS_RGB565 = 1 +HAVE_CHD = 1 +NEED_BPP = 16 +NEED_CD = 1 +NEED_DEINTERLACER = 1 +NEED_TREMOR = 1 +WANT_NEW_API = 1 + +ifeq (@(TUP_ARCH),x86_64) + IS_X86 = 1 +endif + +CORE_DEFINE = -DWANT_PSX_EMU + +include upstream/Makefile.common + +DEFINES += $(FLAGS) + +DEFINES += \ + $(ENDIANNESS_DEFINES) \ + -DSIZEOF_DOUBLE=8 \ + $(WARNINGS) \ + -DMEDNAFEN_VERSION=\"0.9.38.6\" \ + -DPACKAGE=\"mednafen\" \ + -DMEDNAFEN_VERSION_NUMERIC=9386 \ + -DPSS_STYLE=1 \ + -DMPC_FIXED_POINT \ + $(CORE_DEFINE) \ + -DSTDC_HEADERS \ + -D__STDC_LIMIT_MACROS \ + -D__LIBRETRO__ \ + -D_LOW_ACCURACY_ \ + $(EXTRA_INCLUDES) \ + $(SOUND_DEFINE) \ + -D_FILE_OFFSET_BITS=64 \ + +: foreach $(SOURCES_C) |> !libretro_cc |> {obj} +: foreach $(SOURCES_CXX) |> !libretro_cxx |> {obj} +: {obj} |> !libretro_core_link |> {core} +: {core} |> !collect_bin |> +: |> !bin |> + +PKG_DEPENDS += \ + @(PUBLIC_SRC_STDCXX) \ + +: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime} +: |> !pkg |> + +: $(TUP_CWD)/pkg.dhall |> !index_pkg |> diff --git a/cores/beetle-psx/pkg.dhall b/cores/beetle-psx/pkg.dhall new file mode 100644 index 0000000..75f2c29 --- /dev/null +++ b/cores/beetle-psx/pkg.dhall @@ -0,0 +1,17 @@ +let Genode = env:DHALL_GENODE + +let XML = Genode.Prelude.XML + +let defaults = ./../../pkgJoypadDefaults.dhall + +in defaults + ⫽ { indexInfo = + "PSX emulator" + , runtime = + defaults.runtime + ⫽ { resources = + { caps = 512, ram = Genode.units.MiB 128 } + , roms = + defaults.runtime.roms # [ "stdcxx.lib.so" ] + } + } diff --git a/cores/beetle-psx/upstream b/cores/beetle-psx/upstream new file mode 160000 index 0000000..7b584a4 --- /dev/null +++ b/cores/beetle-psx/upstream @@ -0,0 +1 @@ +Subproject commit 7b584a4ce05968482a1e5e3719ba341807f42277 diff --git a/libretro/cores/bluemsx/Tuprules.tup b/cores/bluemsx/Tuprules.tup similarity index 100% rename from libretro/cores/bluemsx/Tuprules.tup rename to cores/bluemsx/Tuprules.tup diff --git a/libretro/cores/bluemsx/runtime b/cores/bluemsx/runtime similarity index 100% rename from libretro/cores/bluemsx/runtime rename to cores/bluemsx/runtime diff --git a/libretro/cores/bluemsx/upstream b/cores/bluemsx/upstream similarity index 100% rename from libretro/cores/bluemsx/upstream rename to cores/bluemsx/upstream diff --git a/libretro/cores/dinothawr/core b/cores/dinothawr/core similarity index 100% rename from libretro/cores/dinothawr/core rename to cores/dinothawr/core diff --git a/libretro/cores/dosbox-libretro/Tuprules.tup b/cores/dosbox-libretro/Tuprules.tup similarity index 100% rename from libretro/cores/dosbox-libretro/Tuprules.tup rename to cores/dosbox-libretro/Tuprules.tup diff --git a/libretro/cores/dosbox-libretro/runtime b/cores/dosbox-libretro/runtime similarity index 100% rename from libretro/cores/dosbox-libretro/runtime rename to cores/dosbox-libretro/runtime diff --git a/libretro/cores/dosbox-libretro/upstream b/cores/dosbox-libretro/upstream similarity index 100% rename from libretro/cores/dosbox-libretro/upstream rename to cores/dosbox-libretro/upstream diff --git a/libretro/cores/dosbox-svn/Tuprules.tup b/cores/dosbox-svn/Tuprules.tup similarity index 100% rename from libretro/cores/dosbox-svn/Tuprules.tup rename to cores/dosbox-svn/Tuprules.tup diff --git a/libretro/cores/dosbox-svn/runtime b/cores/dosbox-svn/runtime similarity index 100% rename from libretro/cores/dosbox-svn/runtime rename to cores/dosbox-svn/runtime diff --git a/libretro/cores/dosbox-svn/upstream b/cores/dosbox-svn/upstream similarity index 100% rename from libretro/cores/dosbox-svn/upstream rename to cores/dosbox-svn/upstream diff --git a/libretro/cores/fceumm/Tuprules.tup b/cores/fceumm/Tuprules.tup similarity index 100% rename from libretro/cores/fceumm/Tuprules.tup rename to cores/fceumm/Tuprules.tup diff --git a/libretro/cores/fceumm/pkg.dhall b/cores/fceumm/pkg.dhall similarity index 100% rename from libretro/cores/fceumm/pkg.dhall rename to cores/fceumm/pkg.dhall diff --git a/libretro/cores/fceumm/upstream b/cores/fceumm/upstream similarity index 100% rename from libretro/cores/fceumm/upstream rename to cores/fceumm/upstream diff --git a/libretro/cores/gambatte/Tuprules.tup b/cores/gambatte/Tuprules.tup similarity index 94% rename from libretro/cores/gambatte/Tuprules.tup rename to cores/gambatte/Tuprules.tup index a29b187..9a34101 100644 --- a/libretro/cores/gambatte/Tuprules.tup +++ b/cores/gambatte/Tuprules.tup @@ -1,4 +1,4 @@ -CORE_PKGS += stdcxx +CORE_PKGS += stdcxx libc libm NO_UNDEFINED = LIBRETRO_COMM_DIR = diff --git a/libretro/cores/gambatte/pkg.dhall b/cores/gambatte/pkg.dhall similarity index 100% rename from libretro/cores/gambatte/pkg.dhall rename to cores/gambatte/pkg.dhall diff --git a/libretro/cores/gambatte/upstream b/cores/gambatte/upstream similarity index 100% rename from libretro/cores/gambatte/upstream rename to cores/gambatte/upstream diff --git a/libretro/cores/link.T b/cores/link.T similarity index 100% rename from libretro/cores/link.T rename to cores/link.T diff --git a/libretro/cores/lutro/upstream b/cores/lutro/upstream similarity index 100% rename from libretro/cores/lutro/upstream rename to cores/lutro/upstream diff --git a/libretro/cores/mgba/Tuprules.tup b/cores/mgba/Tuprules.tup similarity index 100% rename from libretro/cores/mgba/Tuprules.tup rename to cores/mgba/Tuprules.tup diff --git a/libretro/cores/mgba/pkg.dhall b/cores/mgba/pkg.dhall similarity index 100% rename from libretro/cores/mgba/pkg.dhall rename to cores/mgba/pkg.dhall diff --git a/libretro/cores/mgba/upstream b/cores/mgba/upstream similarity index 100% rename from libretro/cores/mgba/upstream rename to cores/mgba/upstream diff --git a/libretro/cores/mrboom/Tuprules.tup b/cores/mrboom/Tuprules.tup similarity index 100% rename from libretro/cores/mrboom/Tuprules.tup rename to cores/mrboom/Tuprules.tup diff --git a/libretro/cores/mrboom/runtime b/cores/mrboom/runtime similarity index 100% rename from libretro/cores/mrboom/runtime rename to cores/mrboom/runtime diff --git a/libretro/cores/mrboom/upstream b/cores/mrboom/upstream similarity index 100% rename from libretro/cores/mrboom/upstream rename to cores/mrboom/upstream diff --git a/libretro/cores/mu/Tuprules.tup b/cores/mu/Tuprules.tup similarity index 100% rename from libretro/cores/mu/Tuprules.tup rename to cores/mu/Tuprules.tup diff --git a/libretro/cores/mu/runtime b/cores/mu/runtime similarity index 100% rename from libretro/cores/mu/runtime rename to cores/mu/runtime diff --git a/libretro/cores/mu/upstream b/cores/mu/upstream similarity index 100% rename from libretro/cores/mu/upstream rename to cores/mu/upstream diff --git a/libretro/cores/nxengine/Tuprules.tup b/cores/nxengine/Tuprules.tup similarity index 100% rename from libretro/cores/nxengine/Tuprules.tup rename to cores/nxengine/Tuprules.tup diff --git a/libretro/cores/nxengine/pkg.dhall b/cores/nxengine/pkg.dhall similarity index 100% rename from libretro/cores/nxengine/pkg.dhall rename to cores/nxengine/pkg.dhall diff --git a/libretro/cores/nxengine/runtime b/cores/nxengine/runtime similarity index 100% rename from libretro/cores/nxengine/runtime rename to cores/nxengine/runtime diff --git a/libretro/cores/nxengine/upstream b/cores/nxengine/upstream similarity index 100% rename from libretro/cores/nxengine/upstream rename to cores/nxengine/upstream diff --git a/cores/oberon/.history b/cores/oberon/.history new file mode 100644 index 0000000..3a6c0da --- /dev/null +++ b/cores/oberon/.history @@ -0,0 +1 @@ +let pkg = ./pkg.dhall diff --git a/libretro/cores/oberon/Tuprules.tup b/cores/oberon/Tuprules.tup similarity index 100% rename from libretro/cores/oberon/Tuprules.tup rename to cores/oberon/Tuprules.tup diff --git a/cores/oberon/pkg.dhall b/cores/oberon/pkg.dhall new file mode 100644 index 0000000..83d58e1 --- /dev/null +++ b/cores/oberon/pkg.dhall @@ -0,0 +1,38 @@ +let Genode = env:DHALL_GENODE + +let Prelude = Genode.Prelude + +let XML = Prelude.XML + +let Frontend = ./../../retro_frontend/package.dhall + +let defaults = ./../../pkgKeyboardDefaults.dhall + +let frontend = + defaults.frontend + ⫽ { vfs = + XML.text + '' + + + + + '' + , game = + XML.text "" + } + +in { indexInfo = + "Oberon RISC emulator (requires three-button mouse)" + , runtime = + defaults.runtime + ⫽ { config = + Frontend.Config.toXML frontend + , resources = + { caps = 256, ram = Genode.units.MiB 32 } + , roms = + defaults.runtime.roms # [ "Oberon-2019-01-21.dsk" ] + } + , frontend = + frontend + } diff --git a/libretro/cores/oberon/runtime b/cores/oberon/runtime similarity index 100% rename from libretro/cores/oberon/runtime rename to cores/oberon/runtime diff --git a/libretro/cores/oberon/upstream b/cores/oberon/upstream similarity index 100% rename from libretro/cores/oberon/upstream rename to cores/oberon/upstream diff --git a/libretro/cores/samples/Tuprules.tup b/cores/samples/Tuprules.tup similarity index 100% rename from libretro/cores/samples/Tuprules.tup rename to cores/samples/Tuprules.tup diff --git a/libretro/cores/samples/audio.runtime b/cores/samples/audio.runtime similarity index 100% rename from libretro/cores/samples/audio.runtime rename to cores/samples/audio.runtime diff --git a/libretro/cores/samples/midi.runtime b/cores/samples/midi.runtime similarity index 100% rename from libretro/cores/samples/midi.runtime rename to cores/samples/midi.runtime diff --git a/libretro/cores/samples/noaudio.runtime b/cores/samples/noaudio.runtime similarity index 100% rename from libretro/cores/samples/noaudio.runtime rename to cores/samples/noaudio.runtime diff --git a/libretro/cores/samples/simple.runtime b/cores/samples/simple.runtime similarity index 100% rename from libretro/cores/samples/simple.runtime rename to cores/samples/simple.runtime diff --git a/libretro/cores/samples/testgl.runtime b/cores/samples/testgl.runtime similarity index 100% rename from libretro/cores/samples/testgl.runtime rename to cores/samples/testgl.runtime diff --git a/libretro/cores/samples/upstream b/cores/samples/upstream similarity index 100% rename from libretro/cores/samples/upstream rename to cores/samples/upstream diff --git a/libretro/cores/snes9x/Tuprules.tup b/cores/snes9x/Tuprules.tup similarity index 100% rename from libretro/cores/snes9x/Tuprules.tup rename to cores/snes9x/Tuprules.tup diff --git a/libretro/cores/snes9x/pkg.dhall b/cores/snes9x/pkg.dhall similarity index 100% rename from libretro/cores/snes9x/pkg.dhall rename to cores/snes9x/pkg.dhall diff --git a/libretro/cores/snes9x/upstream b/cores/snes9x/upstream similarity index 100% rename from libretro/cores/snes9x/upstream rename to cores/snes9x/upstream diff --git a/libretro/cores/tyrquake/Tuprules.tup b/cores/tyrquake/Tuprules.tup similarity index 100% rename from libretro/cores/tyrquake/Tuprules.tup rename to cores/tyrquake/Tuprules.tup diff --git a/libretro/cores/tyrquake/pkg.dhall b/cores/tyrquake/pkg.dhall similarity index 100% rename from libretro/cores/tyrquake/pkg.dhall rename to cores/tyrquake/pkg.dhall diff --git a/libretro/cores/tyrquake/upstream b/cores/tyrquake/upstream similarity index 100% rename from libretro/cores/tyrquake/upstream rename to cores/tyrquake/upstream diff --git a/libretro/cores/yabause/Tuprules.tup b/cores/yabause/Tuprules.tup similarity index 100% rename from libretro/cores/yabause/Tuprules.tup rename to cores/yabause/Tuprules.tup diff --git a/cores/yabause/pkg.dhall b/cores/yabause/pkg.dhall new file mode 100644 index 0000000..5cddd44 --- /dev/null +++ b/cores/yabause/pkg.dhall @@ -0,0 +1,10 @@ +let Genode = env:DHALL_GENODE + +let defaults = ./../../pkgJoypadDefaults.dhall + +in { indexInfo = + "Sega Saturn emulator" + , runtime = + defaults.runtime + ⫽ { resources = { caps = 128, ram = Genode.units.MiB 32 } } + } diff --git a/libretro/cores/yabause/runtime b/cores/yabause/runtime similarity index 100% rename from libretro/cores/yabause/runtime rename to cores/yabause/runtime diff --git a/libretro/games/quake_dopa/Tupfile b/games/quake_dopa/Tupfile similarity index 100% rename from libretro/games/quake_dopa/Tupfile rename to games/quake_dopa/Tupfile diff --git a/games/quake_dopa/pkg.dhall b/games/quake_dopa/pkg.dhall new file mode 100644 index 0000000..cc6d687 --- /dev/null +++ b/games/quake_dopa/pkg.dhall @@ -0,0 +1,40 @@ +let Genode = env:DHALL_GENODE + +let Prelude = Genode.Prelude + +let XML = Prelude.XML + +let Frontend = ./../../retro_frontend/package.dhall + +let defaults = ./../../pkgDefaults.dhall + +let tyquake = ./../../cores/tyrquake/pkg.dhall + +let frontend = + tyquake.frontend + ⫽ { vfs = + XML.text + '' + + + + + + + '' + , game = + XML.text "" + } + +in { indexInfo = + "Quake Episode 5: Dimension of the Past (id1/pak1.pak required)" + , runtime = + tyquake.runtime + ⫽ { config = + Frontend.Config.toXML frontend + , roms = + tyquake.runtime.roms # [ "quake_dopa.tar" ] + } + , frontend = + frontend + } diff --git a/libretro/games/streemerz/Tupfile b/games/streemerz/Tupfile similarity index 100% rename from libretro/games/streemerz/Tupfile rename to games/streemerz/Tupfile diff --git a/libretro/games/streemerz/pkg.dhall b/games/streemerz/pkg.dhall similarity index 100% rename from libretro/games/streemerz/pkg.dhall rename to games/streemerz/pkg.dhall diff --git a/libretro/keyboardJoypad.dhall b/keyboardJoypad.dhall similarity index 100% rename from libretro/keyboardJoypad.dhall rename to keyboardJoypad.dhall diff --git a/libretro/libretro-common b/libretro-common similarity index 100% rename from libretro/libretro-common rename to libretro-common diff --git a/libretro/Tuprules.tup b/libretro/Tuprules.tup deleted file mode 100644 index b337ba5..0000000 --- a/libretro/Tuprules.tup +++ /dev/null @@ -1,3 +0,0 @@ -LIBRETRO_COMM_DIR = $(TUP_CWD)/libretro-common -GIT_VERSION = `git describe --always` -BIN_VERSION = $(GIT_VERSION) diff --git a/libretro/cores/yabause/upstream b/libretro/cores/yabause/upstream deleted file mode 160000 index 7bb35b8..0000000 --- a/libretro/cores/yabause/upstream +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7bb35b865af74282d69f4ecc35ce3a1e0f2d0099 diff --git a/libretro/pkgDefaults.dhall b/pkgDefaults.dhall similarity index 91% rename from libretro/pkgDefaults.dhall rename to pkgDefaults.dhall index d2f9442..2d88b09 100644 --- a/libretro/pkgDefaults.dhall +++ b/pkgDefaults.dhall @@ -20,8 +20,7 @@ in { runtime = [ "audio_out", "file_system", "nitpicker", "rm" ] , resources = { caps = 128, ram = Genode.units.MiB 32 } , roms = - [ "retro_frontend" - , "libc.lib.so" + [ "libc.lib.so" , "libm.lib.so" , "libretro.so" , "vfs.lib.so" diff --git a/libretro/pkgJoypadDefaults.dhall b/pkgJoypadDefaults.dhall similarity index 100% rename from libretro/pkgJoypadDefaults.dhall rename to pkgJoypadDefaults.dhall diff --git a/libretro/pkgKeyboardDefaults.dhall b/pkgKeyboardDefaults.dhall similarity index 100% rename from libretro/pkgKeyboardDefaults.dhall rename to pkgKeyboardDefaults.dhall diff --git a/libretro/retro_frontend b/retro_frontend similarity index 100% rename from libretro/retro_frontend rename to retro_frontend diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 89b218d..0000000 --- a/shell.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs ? import { } }: - -pkgs.shell.mkShell - { buildInputs = with pkgs; - [ ports.libc.dev - ports.stdcxx.dev - ports.egl_api.dev - ports.mesa.dev - ]; - } diff --git a/libretro/tests/240pSuite-SNES/240pSuite-SNES-1.03.zip b/tests/240pSuite-SNES/240pSuite-SNES-1.03.zip similarity index 100% rename from libretro/tests/240pSuite-SNES/240pSuite-SNES-1.03.zip rename to tests/240pSuite-SNES/240pSuite-SNES-1.03.zip diff --git a/libretro/tests/240pSuite-SNES/Tupfile b/tests/240pSuite-SNES/Tupfile similarity index 100% rename from libretro/tests/240pSuite-SNES/Tupfile rename to tests/240pSuite-SNES/Tupfile diff --git a/libretro/tests/240pSuite-SNES/pkg.dhall b/tests/240pSuite-SNES/pkg.dhall similarity index 100% rename from libretro/tests/240pSuite-SNES/pkg.dhall rename to tests/240pSuite-SNES/pkg.dhall diff --git a/libretro/tests/240pee-NES/240pee-0.08.2.zip b/tests/240pee-NES/240pee-0.08.2.zip similarity index 100% rename from libretro/tests/240pee-NES/240pee-0.08.2.zip rename to tests/240pee-NES/240pee-0.08.2.zip diff --git a/libretro/tests/240pee-NES/Tupfile b/tests/240pee-NES/Tupfile similarity index 100% rename from libretro/tests/240pee-NES/Tupfile rename to tests/240pee-NES/Tupfile diff --git a/libretro/tests/240pee-NES/pkg.dhall b/tests/240pee-NES/pkg.dhall similarity index 100% rename from libretro/tests/240pee-NES/pkg.dhall rename to tests/240pee-NES/pkg.dhall diff --git a/libretro/tests/topbench/Tuprules.tup b/tests/topbench/Tuprules.tup similarity index 100% rename from libretro/tests/topbench/Tuprules.tup rename to tests/topbench/Tuprules.tup diff --git a/libretro/tests/topbench/dosbox-libretro/Tupfile b/tests/topbench/dosbox-libretro/Tupfile similarity index 100% rename from libretro/tests/topbench/dosbox-libretro/Tupfile rename to tests/topbench/dosbox-libretro/Tupfile diff --git a/libretro/tests/topbench/dosbox-svn/Tupfile b/tests/topbench/dosbox-svn/Tupfile similarity index 100% rename from libretro/tests/topbench/dosbox-svn/Tupfile rename to tests/topbench/dosbox-svn/Tupfile diff --git a/libretro/tests/topbench/pkg.dhall b/tests/topbench/pkg.dhall similarity index 100% rename from libretro/tests/topbench/pkg.dhall rename to tests/topbench/pkg.dhall diff --git a/libretro/tests/topbench/runtime b/tests/topbench/runtime similarity index 100% rename from libretro/tests/topbench/runtime rename to tests/topbench/runtime