diff --git a/.gitmodules b/.gitmodules index e10360be8..5ce014359 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/upstream + path = libretro/cores/dosbox-libretro/upstream url = https://github.com/libretro/dosbox-libretro [submodule "libretro/cores/mrboom/core"] path = libretro/cores/mrboom/upstream diff --git a/Tupfile b/Tupfile index fb1c49d7d..ef55468c6 100644 --- a/Tupfile +++ b/Tupfile @@ -8,7 +8,7 @@ SHORT_SUM = b2sum -l24 : $(DEPOT_DIR)/ $(DEPOT_DIR)/ |> \ for f in % %; do \ - awk -F '/' '{print "s|local/"$2"/"$3"|@(PUBLIC_USER)/"$2"/"$3"/"$4"|"}' $f >> %o; done; \ + awk -F '/' '{print "s|local/"$2"/"$3"/current|@(PUBLIC_USER)/"$2"/"$3"/"$4"|"}' $f >> %o; done; \ |> $(VERSIONS_SED_FILE) # Generate a listing of all raw archives @@ -22,16 +22,16 @@ SHORT_SUM = b2sum -l24 |> $(BIN_LISTING) # Generate a listing of all binary archives -: $(DEPOT_DIR)/ |> \ - $(SHORT_SUM) % | awk -F '/' \ - '/_ARCHIVES/ {print "s|_/pkg/"$4"/current|@(PUBLIC_USER)/pkg/"$4"/"substr($0,0,6)"|"}' > %o; \ +: $(DEPOT_DIR)/ |> ^ generate package version sed script^ \ + for d in `dirname % | tr ' ' '\n' | sort -u`; do \ + echo $d/`cat $d/_ARCHIVES $d/runtime | $(SHORT_SUM)` | awk -F '/' \ + '{print "s|local/pkg/"$4"/current|@(PUBLIC_USER)/pkg/"$4"/"substr($6,0,6)"|"}' >> %o; \ + done \ |> $(PKG_SED_FILE) # Generate sed commands for replacing package versions -: index.xml | pkg.sed |> sed -f pkg.sed %f | xz > %o \ - |> public/@(PUBLIC_USER)/index/@(SCULPT_VERSION).xz - -: $(DEPOT_DIR)/ $(DEPOT_DIR)/ $(DEPOT_DIR)/ |> \ +: $(DEPOT_DIR)/ $(DEPOT_DIR)/ $(PKG_SED_FILE) |> \ + ^ generate public makefile^ \ echo PUBLIC_USER=@(PUBLIC_USER) >> %o; \ echo PUBLIC_ARCH=@(TUP_ARCH) >> %o; \ echo "all: public/@(PUBLIC_USER)/index/@(SCULPT_VERSION).xz.sig" >> %o; \ @@ -43,21 +43,22 @@ SHORT_SUM = b2sum -l24 awk -F '/' -f errata/raw.mk.awk $f >> %o; done; \ for f in %; do \ awk -F '/' -f errata/bin.mk.awk $f >> %o; done; \ - $(SHORT_SUM) % | awk -f errata/pkg.mk.awk >> %o; \ + awk -F '/' -f errata/pkg.mk.awk $(PKG_SED_FILE) >> %o; done \ |> Makefile # Generate the makefile for creating signed package tarballs -DEPOT_INDEX_FILE = $(DEPOT_DIR)/index/@(SCULPT_VERSION) -PUBLIC_INDEX_FILE = $(PUBLIC_DIR)/index/@(SCULPT_VERSION) +: index.xml | $(PKG_SED_FILE) |> ^ generate public index^ \ + sed \ + -e 's|_/pkg/\(\w*\)|local/pkg/\1/current|' \ + -f $(PKG_SED_FILE) %f \ + | xz > %o \ +|> public/@(PUBLIC_USER)/index/@(SCULPT_VERSION).xz AWK_RUNTIME_PATH = awk -v RS=' ' -F '/' \ - '{print " "}' + '/runtime/ {print " "}' -: $(DEPOT_DIR)/ $(DEPOT_DIR)/ |> ^ generate index^ \ +: $(DEPOT_DIR)/ |> ^ generate local index^ \ echo '' > %o; \ - echo ' ' >> %o; \ - echo % | $(AWK_RUNTIME_PATH) >> %o; \ - echo ' ' >> %o; \ - echo % | $(AWK_RUNTIME_PATH) >> %o; \ - echo '' >> %o |> $(DEPOT_INDEX_FILE) {index} + echo % | $(AWK_RUNTIME_PATH) | sort >> %o; \ + echo '' >> %o |> $(DEPOT_DIR)/index/@(SCULPT_VERSION) # Generate the depot index file diff --git a/Tuprules.tup b/Tuprules.tup index 4d7280873..eee22681b 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -1,39 +1,55 @@ +ifeq ($(RAW_NAME),) +RAW_NAME = $(TARGET_NAME) +endif + +ifeq ($(BIN_NAME),) +BIN_NAME = $(TARGET_NAME) +endif + +ifeq ($(PKG_NAME),) +PKG_NAME = $(TARGET_NAME) +endif + !raw = |> ^ COLLECT %o^ \ - echo $(RAW_DEPENDS) local/raw/%d/$(raw_VERSION) | tr ' ' '\n' > %o; \ - echo local/raw/%d/$(RAW_VERSION) > %o \ -|> $(DEPOT_RAW_DIR)/%d/current/_ARCHIVES $(DEPOT_DIR)/ + echo $(RAW_DEPENDS) local/raw/$(RAW_NAME)/$(RAW_VERSION) | tr ' ' '\n' > %o; \ + echo local/raw/$(RAW_NAME)/$(RAW_VERSION) > %o \ +|> $(DEPOT_RAW_DIR)/$(RAW_NAME)/current/_ARCHIVES $(DEPOT_DIR)/ !bin = |> ^ COLLECT %o^ \ - echo $(BIN_DEPENDS) local/src/%d/$(BIN_VERSION) | tr ' ' '\n' > %o; \ -|> $(DEPOT_BIN_DIR)/%d/current/_ARCHIVES $(DEPOT_DIR)/ + echo $(BIN_DEPENDS) local/src/$(BIN_NAME)/$(BIN_VERSION) | tr ' ' '\n' > %o; \ +|> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/_ARCHIVES $(DEPOT_DIR)/ AWK_LOCAL_ARCHIVES = awk -F '/' \ '{if ($1 != "local") {print $0} \ else {print $1"/"$2"/"$3"/current"}}' -!pkg = | $(VERSIONS_SED_FILE) |> ^ GENERATE %o^ \ - echo $(PKG_DEPENDS) | tr ' ' '\n' \ - > $(DEPOT_PKG_DIR)/%d/current/archives; \ - sed -f $(VERSIONS_SED_FILE) $(DEPOT_PKG_DIR)/%d/current/archives \ - > $(DEPOT_PKG_DIR)/%d/current/_ARCHIVES; \ -|> $(DEPOT_PKG_DIR)/%d/current/archives $(DEPOT_PKG_DIR)/%d/current/_ARCHIVES \ - $(DEPOT_DIR)/ - # Generate depot/local/pkg/.../current/[archives|_ARCHIVES] +!pkg = |> |> !collect_raw = |> ^ COLLECT %o^ \ cp %f %o \ -|> $(DEPOT_RAW_DIR)/%d/current/%b +|> $(DEPOT_RAW_DIR)/$(RAW_NAME)/current/%b !collect_bin = |> ^ COLLECT %o^ \ strip -o %o %f \ -|> $(DEPOT_BIN_DIR)/%d/current/%b +|> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/%b -!collect_pkg_runtime = |> ^ VALIDATE %o^ \ - xmllint -schema $(ERRATA_DIR)/runtime.xsd %f > %o \ -|> $(DEPOT_PKG_DIR)/%d/current/runtime $(DEPOT_DIR)/ +!collect_pkg_runtime = | $(VERSIONS_SED_FILE) |> ^ packag $(PKG_NAME)^ \ + xmllint -schema $(ERRATA_DIR)/runtime.xsd %f \ + > $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/runtime; \ + echo $(PKG_DEPENDS) | tr ' ' '\n' | sed \ + -e 's|_/\(.*\)/\(.*\)$|local/\1/\2/current|' \ + > $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives; \ + sed -f $(VERSIONS_SED_FILE) $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives \ + > $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/_ARCHIVES; \ +|> \ + $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives \ + $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/_ARCHIVES \ + $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/runtime \ + $(DEPOT_DIR)/ !collect_pkg = |> ^ COLLECT %o^ cp %f %o \ - |> $(DEPOT_PKG_DIR)/%d/current/%b + |> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/%b \ + $(DEPOT_DIR)/ VERSIONS_SED_FILE = $(TUP_CWD)/versions.sed PKG_SED_FILE = $(TUP_CWD)/pkg.sed diff --git a/errata/pkg.mk.awk b/errata/pkg.mk.awk index 3ad648bbd..f9847a665 100644 --- a/errata/pkg.mk.awk +++ b/errata/pkg.mk.awk @@ -1,20 +1,13 @@ -{ split($2,a,"/") } - -{ if (a[6] == "_ARCHIVES") { - -{ src=a[1]"/"a[2]"/"a[3]"/"a[4]"/"a[5] } -{ tar="public/$(PUBLIC_USER)/pkg/"a[4]"/"$1".tar.xz" } +{ ver=substr($7,0,6) } +{ tar="public/$(PUBLIC_USER)/pkg/"$6"/"ver".tar.xz" } { sig=tar".sig" } { print "all: " tar ".sig" } -{ print tar": "$2" pkg.sed" } +{ print tar": depot/local/pkg/"$6"/current/_ARCHIVES pkg.sed" } { print " @echo tar $@" } -{ print " @mkdir -p "$1 } -{ print " @sed -e 's|^local/|$(PUBLIC_USER)/|' -f pkg.sed $< > "$1"/archives" } -{ print " @cp $(dir $<)/runtime "$1 } -{ print " @mkdir -p $(dir $@)" } -{ print " @tar cfJ $@ "$1 } -{ print " @rm -r "$1 } - -}} +{ print " @mkdir -p $(dir $@) "ver } +{ print " @cp $< "ver"/archives" } +{ print " @cp $(dir $<)/runtime "ver } +{ print " @tar cfJ $@ "ver } +{ print " @rm -r "ver } diff --git a/libretro/cores/2048/Tuprules.tup b/libretro/cores/2048/Tuprules.tup index a5a3080b9..b3239f1d5 100644 --- a/libretro/cores/2048/Tuprules.tup +++ b/libretro/cores/2048/Tuprules.tup @@ -10,5 +10,5 @@ include upstream/Makefile.common : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/4do/Tuprules.tup b/libretro/cores/4do/Tuprules.tup index d9e8a4c11..9eaf11323 100644 --- a/libretro/cores/4do/Tuprules.tup +++ b/libretro/cores/4do/Tuprules.tup @@ -13,7 +13,7 @@ DEFINES += \ include upstream/Makefile.common -CFLAGS += $(FLAGS) +DEFINES += $(FLAGS) : foreach $(SOURCES_C) |> !libretro_cc |> {libretro_objs} @@ -21,5 +21,4 @@ CFLAGS += $(FLAGS) : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> -: |> !pkg |> +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> diff --git a/libretro/cores/Tuprules.tup b/libretro/cores/Tuprules.tup index b2b416333..893aac6f0 100644 --- a/libretro/cores/Tuprules.tup +++ b/libretro/cores/Tuprules.tup @@ -1,43 +1,9 @@ -DEPOT_NAME = $(TARGET_NAME) - -!raw = |> ^ COLLECT %o^ \ - echo local/raw/$(TARGET_NAME)/$(RAW_VERSION) > %o \ -|> $(DEPOT_RAW_DIR)/$(DEPOT_NAME)/current/_ARCHIVES $(DEPOT_DIR)/ - -!bin = |> ^ COLLECT %o^ \ - echo $(REMOTE_DEPENDS) local/src/libretro-$(DEPOT_NAME)/$(BIN_VERSION) | tr ' ' '\n' > %o; \ -|> $(DEPOT_BIN_DIR)/libretro-$(DEPOT_NAME)/current/_ARCHIVES $(DEPOT_DIR)/ - -!pkg = | $(VERSIONS_SED_FILE) |> ^ GENERATE %o^ \ - echo $(PKG_DEPENDS) | tr ' ' '\n' \ - > $(DEPOT_PKG_DIR)/$(DEPOT_NAME)/current/archives; \ - sed -f $(VERSIONS_SED_FILE) $(DEPOT_PKG_DIR)/$(DEPOT_NAME)/current/archives \ - > $(DEPOT_PKG_DIR)/$(DEPOT_NAME)/current/_ARCHIVES; \ - ! grep ^local/ $(DEPOT_PKG_DIR)/$(DEPOT_NAME)/current/_ARCHIVES; \ -|> $(DEPOT_PKG_DIR)/$(DEPOT_NAME)/current/archives $(DEPOT_PKG_DIR)/$(DEPOT_NAME)/current/_ARCHIVES \ - $(DEPOT_DIR)/ - # Generate depot/local/pkg/.../current/[archives|_ARCHIVES] - +# Implicit dependencies PKG_DEPENDS += \ @(SDK_USER)/src/vfs/@(SDK_VERSION) \ @(SDK_USER)/src/libc/@(SDK_VERSION) \ - local/src/libretro-$(DEPOT_NAME) \ - local/src/retro_frontend \ - - # Implicit dependencies - -!collect_raw = |> ^ COLLECT %o^ \ - cp %f %o \ -|> $(DEPOT_RAW_DIR)/$(DEPOT_NAME)/current/%b - -!collect_bin = |> ^ COLLECT %o^ \ - strip -o %o %f \ -|> $(DEPOT_BIN_DIR)/libretro-$(DEPOT_NAME)/current/%b - -!collect_runtime = |> ^ VALIDATE %o^ \ - xmllint -schema $(ERRATA_DIR)/runtime.xsd %f > %o \ -|> $(DEPOT_PKG_DIR)/$(DEPOT_NAME)/current/runtime \ - $(DEPOT_DIR)/ + _/src/$(BIN_NAME) \ + _/src/retro_frontend \ !libretro_cc = |> ^ CC %f^ \ $(CC) \ diff --git a/libretro/cores/bluemsx/Tuprules.tup b/libretro/cores/bluemsx/Tuprules.tup index e6bccf050..1ea84c415 100644 --- a/libretro/cores/bluemsx/Tuprules.tup +++ b/libretro/cores/bluemsx/Tuprules.tup @@ -1,10 +1,8 @@ -# TODO: -# this core requires the two folders named Machines/ and Databases/ from standalone blueMSX -# copied inside your frontend's system directory. See upstream/README.md - CORE_PKGS += stdcxx libc libm NO_UNDEFINED = +LIBRETRO_COMM_DIR = + DEBUG = 0 LOG_PERFORMANCE = 0 HAVE_COMPAT = 0 @@ -34,5 +32,18 @@ CXXFLAGS += -w : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +: |> wget --quiet http://bluemsx.msxblue.com/rel_download/%o |> blueMSXv282.zip {zip} + +: {zip} \ + |> unzip %f -d tmp ; tar cf %o -C tmp Machines Databases ; rm -r tmp \ + |> blueMSX.tar {tar} + +: {tar} |> !collect_raw |> +: |> !raw |> + +PKG_DEPENDS += \ + @(SDK_USER)/src/stdcxx/@(SDK_VERSION) \ + _/raw/bluemsx \ + +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/dosbox/Tuprules.tup b/libretro/cores/dosbox-libretro/Tuprules.tup similarity index 83% rename from libretro/cores/dosbox/Tuprules.tup rename to libretro/cores/dosbox-libretro/Tuprules.tup index 39b6f7ca0..c538478dd 100644 --- a/libretro/cores/dosbox/Tuprules.tup +++ b/libretro/cores/dosbox-libretro/Tuprules.tup @@ -14,7 +14,7 @@ SOURCES_CXX += $(LIBRETRO_COMM_DIR)/libco/genode.cpp DEFINES += -O2 -DNDEBUG -D__GENODE__ CFLAGS += $(COMMONFLAGS) -CXXFLAGS += -DHAVE_MMAP +DEFINES += -DHAVE_MMAP # Use anonymous mmap to allocate executable memory pages : foreach $(SOURCES_C) |> !libretro_cc |> {libretro_objs} @@ -24,5 +24,8 @@ CXXFLAGS += -DHAVE_MMAP : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +PKG_DEPENDS += \ + @(SDK_USER)/src/stdcxx/@(SDK_VERSION) \ + +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/dosbox/runtime b/libretro/cores/dosbox-libretro/runtime similarity index 100% rename from libretro/cores/dosbox/runtime rename to libretro/cores/dosbox-libretro/runtime diff --git a/libretro/cores/dosbox-libretro/upstream b/libretro/cores/dosbox-libretro/upstream new file mode 160000 index 000000000..6dc49e435 --- /dev/null +++ b/libretro/cores/dosbox-libretro/upstream @@ -0,0 +1 @@ +Subproject commit 6dc49e4356c78ae097fa39d5e3ccb7e50215d4bd diff --git a/libretro/cores/dosbox/upstream b/libretro/cores/dosbox/upstream deleted file mode 160000 index bb615dc8a..000000000 --- a/libretro/cores/dosbox/upstream +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bb615dc8ac6279185fc52fb05f32f397d715df02 diff --git a/libretro/cores/fceumm/Tuprules.tup b/libretro/cores/fceumm/Tuprules.tup index 419a1cd74..caf11c239 100644 --- a/libretro/cores/fceumm/Tuprules.tup +++ b/libretro/cores/fceumm/Tuprules.tup @@ -15,5 +15,5 @@ DEFINES += -Wno-write-strings : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/gambatte/Tuprules.tup b/libretro/cores/gambatte/Tuprules.tup index 46e0077bb..1eb0c0d6f 100644 --- a/libretro/cores/gambatte/Tuprules.tup +++ b/libretro/cores/gambatte/Tuprules.tup @@ -2,12 +2,11 @@ CORE_PKGS += stdcxx NO_UNDEFINED = LIBRETRO_COMM_DIR = - # TODO: update LIBRETRO_COMM_DIR -CFLAGS += -O2 -DNDEBUG -CFLAGS += -DHAVE_STDINT_H -CFLAGS += -D__LIBRETRO__ -DHAVE_STDINT_H -DHAVE_INTTYPES_H -CFLAGS += -DINLINE=inline -DVIDEO_RGB565 +DEFINES += -O2 -DNDEBUG +DEFINES += -DHAVE_STDINT_H +DEFINES += -D__LIBRETRO__ -DHAVE_STDINT_H -DHAVE_INTTYPES_H +DEFINES += -DINLINE=inline -DVIDEO_RGB565 include upstream/Makefile.common @@ -18,5 +17,7 @@ include upstream/Makefile.common : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +PKG_DEPENDS += @(SDK_USER)/src/stdcxx/@(SDK_VERSION) + +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/mgba/Tuprules.tup b/libretro/cores/mgba/Tuprules.tup index 44229a3f9..35621831b 100644 --- a/libretro/cores/mgba/Tuprules.tup +++ b/libretro/cores/mgba/Tuprules.tup @@ -14,5 +14,8 @@ CFLAGS += $(INCLUDES) : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +PKG_DEPENDS += \ + @(SDK_USER)/src/stdcxx/@(SDK_VERSION) \ + +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/mrboom/Tuprules.tup b/libretro/cores/mrboom/Tuprules.tup index 867cde0d1..0abf1d6e9 100644 --- a/libretro/cores/mrboom/Tuprules.tup +++ b/libretro/cores/mrboom/Tuprules.tup @@ -21,5 +21,5 @@ include upstream/Makefile.common : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/mu/Tuprules.tup b/libretro/cores/mu/Tuprules.tup new file mode 100644 index 000000000..d1aac4236 --- /dev/null +++ b/libretro/cores/mu/Tuprules.tup @@ -0,0 +1,26 @@ +CORE_PKGS += libc libm + +LIBRETRO_COMM_DIR = + +DEFINES += -O2 -DNDEBUG +DEFINES += -DINLINE=inline + +include upstream/libretroBuildSystem/build/Makefile.common +include upstream/src/makefile.all +SOURCES_C += $(EMU_SOURCES_C) + +DEFINES += $(COREDEFINES) +DEFINES += $(INCFLAGS) + +CFLAGS += -Wall -W -Wno-unused-parameter -Wno-sign-compare -Wno-uninitialized +CFLAGS += -fomit-frame-pointer + +: foreach $(SOURCES_C) |> !libretro_cc |> {libretro_objs} + +: {libretro_objs} |> !libretro_core_link |> {core} +: {core} |> !collect_bin |> + +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> + +: |> !bin |> +: |> !pkg |> diff --git a/libretro/cores/mu/runtime b/libretro/cores/mu/runtime new file mode 100644 index 000000000..81b1bc1b4 --- /dev/null +++ b/libretro/cores/mu/runtime @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libretro/cores/nxengine/Tuprules.tup b/libretro/cores/nxengine/Tuprules.tup index 9cd0cec54..e4eb975fc 100644 --- a/libretro/cores/nxengine/Tuprules.tup +++ b/libretro/cores/nxengine/Tuprules.tup @@ -1,4 +1,4 @@ -CORE_PKGS += stdcxx libc libm +CORE_PKGS += libc libm NO_UNDEFINED = # __cxa_... @@ -18,5 +18,5 @@ CXXFLAGS += -fno-rtti -fno-exceptions : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/oberon/Tuprules.tup b/libretro/cores/oberon/Tuprules.tup index 57070feab..ed20749b3 100644 --- a/libretro/cores/oberon/Tuprules.tup +++ b/libretro/cores/oberon/Tuprules.tup @@ -13,5 +13,8 @@ include upstream/Libretro/Makefile.common : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +PKG_DEPENDS += \ + _/raw/oberon \ + +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/samples/Tuprules.tup b/libretro/cores/samples/Tuprules.tup index 781af666b..1bb497f06 100644 --- a/libretro/cores/samples/Tuprules.tup +++ b/libretro/cores/samples/Tuprules.tup @@ -13,55 +13,55 @@ ifeq ($(TARGET_NAME),testaudio_callback) CFLAGS += -I../../libretro-common/include SOURCES_C += libretro-test.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/audio.runtime |> !collect_runtime |> + : $(TUP_CWD)/audio.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),testaudio_no_callback) CFLAGS += -I../../libretro-common/include SOURCES_C += libretro-test.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/audio.runtime |> !collect_runtime |> + : $(TUP_CWD)/audio.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),testaudio_playback_wav) CFLAGS += -I../../libretro-common/include SOURCES_C += libretro-test.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/audio.runtime |> !collect_runtime |> + : $(TUP_CWD)/audio.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),button_test) CFLAGS += -Ilibretro-common/include SOURCES_C += libretro.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/simple.runtime |> !collect_runtime |> + : $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),freebasic) TARGET_NAME= # : fbastest.bas |> fbc -dll %f -x %o |> libretro.so {core} # PKG_DEPENDS += $(SIMPLE_DEPENDS) -# : $(TUP_CWD)/simple.runtime |> !collect_runtime |> +# : $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),pascal_pong) TARGET_NAME= # : pong.pas |> fpc -o%o %f |> libretro.so {core} # PKG_DEPENDS += $(SIMPLE_DEPENDS) -# : $(TUP_CWD)/simple.runtime |> !collect_runtime |> +# : $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),midi_test) SOURCES_C += libretro.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/midi.runtime |> !collect_runtime |> + : $(TUP_CWD)/midi.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),test) CFLAGS += -I../../libretro-common/include SOURCES_C += libretro-test.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/simple.runtime |> !collect_runtime |> + : $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),cruzes) @@ -70,14 +70,14 @@ ifeq ($(TARGET_NAME),cruzes) # : obj/Carlito-Regular.ttf |> ttf2c 16 font16 %f %o |> font16.h # : obj/Carlito-Regular.ttf |> ttf2c 10 font10 %f %o |> font10.h PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/simple.runtime |> !collect_runtime |> + : $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),advanced_tests) CFLAGS += -I../../libretro-common/include SOURCES_C += libretro-test.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/audio.runtime |> !collect_runtime |> + : $(TUP_CWD)/audio.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),testgl_compute_shaders) @@ -90,7 +90,7 @@ ifeq ($(TARGET_NAME),testgl_compute_shaders) SOURCES_C += glsym/glsym_gl.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/testgl.runtime |> !collect_runtime |> + : $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),testgl_ff) @@ -98,7 +98,7 @@ ifeq ($(TARGET_NAME),testgl_ff) CFLAGS += SOURCES_C += libretro_gl_ff_test.c glsym/rglgen.c glsym/glsym_gl.c PKG_DEPENDS += $(GL_DEPENDS) - : $(TUP_CWD)/testgl.runtime |> !collect_runtime |> + : $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),testgl) @@ -109,35 +109,35 @@ ifeq ($(TARGET_NAME),testgl) SOURCES_C += glsym/glsym_gl.c PKG_DEPENDS += $(GL_DEPENDS) - : $(TUP_CWD)/testgl.runtime |> !collect_runtime |> + : $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),testsw) CFLAGS += -I../../libretro-common/include SOURCES_C += libretro-test.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/simple.runtime |> !collect_runtime |> + : $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),testsw_vram) CFLAGS += -I../../libretro-common/include SOURCES_C += libretro-test.c PKG_DEPENDS += $(SIMPLE_DEPENDS) - : $(TUP_CWD)/simple.runtime |> !collect_runtime |> + : $(TUP_CWD)/simple.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),testvulkan_async_compute) CFLAGS += -I../../libretro-common/include -Iinclude SOURCES_C += libretro-test.c vulkan_symbol_wrapper.c PKG_DEPENDS += $(GL_DEPENDS) - : $(TUP_CWD)/testgl.runtime |> !collect_runtime |> + : $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |> endif ifeq ($(TARGET_NAME),testvulkan) CFLAGS += -I../../libretro-common/include -Iinclude SOURCES_C += libretro-test.c vulkan_symbol_wrapper.c PKG_DEPENDS += $(GL_DEPENDS) - : $(TUP_CWD)/testgl.runtime |> !collect_runtime |> + : $(TUP_CWD)/testgl.runtime |> !collect_pkg_runtime |> endif ifneq ($(TARGET_NAME),) @@ -147,7 +147,7 @@ ifneq ($(TARGET_NAME),) : {core} |> !collect_bin |> : |> !bin |> -#: README.md |> !collect_runtime |> +#: README.md |> !collect_pkg_runtime |> : |> !pkg |> endif diff --git a/libretro/cores/snes9x/Tuprules.tup b/libretro/cores/snes9x/Tuprules.tup index 92fbde83c..cc7f813d2 100644 --- a/libretro/cores/snes9x/Tuprules.tup +++ b/libretro/cores/snes9x/Tuprules.tup @@ -18,5 +18,8 @@ CXXFLAGS += -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +PKG_DEPENDS += \ + @(SDK_USER)/src/stdcxx/@(SDK_VERSION) \ + +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/libretro/cores/tyrquake/Tuprules.tup b/libretro/cores/tyrquake/Tuprules.tup index d59d8363e..86ab22268 100644 --- a/libretro/cores/tyrquake/Tuprules.tup +++ b/libretro/cores/tyrquake/Tuprules.tup @@ -26,5 +26,8 @@ include upstream/Makefile.common : {core} |> !collect_bin |> : |> !bin |> -: $(TUP_CWD)/runtime |> !collect_runtime |> +PKG_DEPENDS += \ + ehmry/raw/quake_shareware/1.06 \ + +: $(TUP_CWD)/runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/runtimes/backdrop/Tupfile b/runtimes/backdrop/Tupfile index 975ef170c..e193cd0f9 100644 --- a/runtimes/backdrop/Tupfile +++ b/runtimes/backdrop/Tupfile @@ -1,6 +1,8 @@ +TARGET_NAME = backdrop + PKG_DEPENDS += \ nfeske/pkg/backdrop/2019-02-22 \ - local/raw/backdrop \ + _/raw/backdrop \ include_rules diff --git a/runtimes/cave_story/Tuprules.tup b/runtimes/cave_story/Tuprules.tup index 3c3c64345..41050ee36 100644 --- a/runtimes/cave_story/Tuprules.tup +++ b/runtimes/cave_story/Tuprules.tup @@ -2,8 +2,8 @@ PKG_DEPENDS += \ @(SDK_USER)/src/vfs/@(SDK_VERSION) \ @(SDK_USER)/src/libc/@(SDK_VERSION) \ @(SDK_USER)/src/stdcxx/@(SDK_VERSION) \ - local/src/libretro-nxengine \ - local/src/retro_frontend \ + _/src/nxengine \ + _/src/retro_frontend \ -: ../runtime |> !collect_pkg |> +: ../runtime |> !collect_pkg_runtime |> : |> !pkg |> diff --git a/runtimes/cave_story/cave_story-en/Tupfile b/runtimes/cave_story/cave_story-en/Tupfile index da541d03d..f87774836 100644 --- a/runtimes/cave_story/cave_story-en/Tupfile +++ b/runtimes/cave_story/cave_story-en/Tupfile @@ -1,13 +1,14 @@ ifndef CONFIG_NO_NETWORK +TARGET_NAME = cave_story-en + PKG_DEPENDS += \ - local/raw/cave_story-en \ + _/raw/cave_story-en \ include_rules : |> wget --quiet https://www.cavestory.org/downloads/%o |> cavestoryen.zip {zip} - : {zip} |> unzip -qD %f -d tmp ; tar cf %o -C tmp/CaveStory . ; rm -r tmp |> doukutsu.tar {tar} RAW_VERSION = 2004.12 diff --git a/runtimes/depot_9P/Tupfile b/runtimes/depot_9P/Tupfile index 531439af8..a7789a923 100644 --- a/runtimes/depot_9P/Tupfile +++ b/runtimes/depot_9P/Tupfile @@ -1,8 +1,10 @@ +TARGET_NAME = depot_9P + PKG_DEPENDS += \ @(SDK_USER)/src/libc/@(SDK_VERSION) \ @(SDK_USER)/src/vfs/@(SDK_VERSION) \ @(PUBLIC_SRC_LWIP) \ - local/src/ninep \ + _/src/ninep \ include_rules diff --git a/runtimes/fetch-nixos/Tupfile b/runtimes/fetch-nixos/Tupfile index b0f5b5a3c..80fbfa1db 100644 --- a/runtimes/fetch-nixos/Tupfile +++ b/runtimes/fetch-nixos/Tupfile @@ -1,3 +1,5 @@ +TARGET_NAME = fetch-nixos + PKG_DEPENDS += \ @(SDK_USER)/src/init/@(SDK_VERSION) \ @(SDK_USER)/src/libc/@(SDK_VERSION) \ @@ -10,8 +12,8 @@ PKG_DEPENDS += \ genodelabs/src/report_rom/2019-02-25 \ ehmry/src/vfs_lwip/2019-03-04 \ genodelabs/src/zlib/2019-02-25 \ - local/raw/fetch-nixos/ \ - local/src/fetch_and_copy \ + _/raw/fetch-nixos/ \ + _/src/fetch_and_copy \ include_rules diff --git a/runtimes/icy-streams/Tuprules.tup b/runtimes/icy-streams/Tuprules.tup index d31bc4d8a..503f92bc3 100644 --- a/runtimes/icy-streams/Tuprules.tup +++ b/runtimes/icy-streams/Tuprules.tup @@ -6,7 +6,7 @@ PKG_DEPENDS += \ @(UPSTREAM_USER)/src/mp3_audio_sink/@(DEPOT_VERSION) \ @(UPSTREAM_USER)/src/vfs_lwip/@(UPSTREAM_VERSION) \ @(UPSTREAM_USER)/src/zlib/@(UPSTREAM_VERSION) \ - local/src/icy_client \ + _/src/icy_client \ : ../runtime.in |> sed 's|@STREAM_URL@|$(STREAM_URL)|' %f > %o |> runtime : runtime |> !collect_pkg_runtime |> diff --git a/runtimes/icy-streams/ifm1/Tupfile b/runtimes/icy-streams/ifm1/Tupfile index 9941d9a00..17a15084c 100644 --- a/runtimes/icy-streams/ifm1/Tupfile +++ b/runtimes/icy-streams/ifm1/Tupfile @@ -1,2 +1,3 @@ +TARGET_NAME = ifm1 STREAM_URL = http://radio.intergalactic.fm:80/1 include_rules diff --git a/runtimes/icy-streams/ifm2/Tupfile b/runtimes/icy-streams/ifm2/Tupfile index 6a1e89bc7..42afd1f93 100644 --- a/runtimes/icy-streams/ifm2/Tupfile +++ b/runtimes/icy-streams/ifm2/Tupfile @@ -1,2 +1,3 @@ +TARGET_NAME = ifm2 STREAM_URL = http://radio.intergalactic.fm:80/2 include_rules diff --git a/runtimes/icy-streams/ifm3/Tupfile b/runtimes/icy-streams/ifm3/Tupfile index 7eb605951..8204388e5 100644 --- a/runtimes/icy-streams/ifm3/Tupfile +++ b/runtimes/icy-streams/ifm3/Tupfile @@ -1,2 +1,3 @@ +TARGET_NAME = ifm3 STREAM_URL = http://radio.intergalactic.fm:80/3 include_rules diff --git a/runtimes/soyuz/Tupfile b/runtimes/soyuz/Tupfile index 6d31e09f7..965bc279e 100644 --- a/runtimes/soyuz/Tupfile +++ b/runtimes/soyuz/Tupfile @@ -1,16 +1,27 @@ ifndef CONFIG_NO_NETWORK + +TARGET_NAME = soyuz + +PKG_DEPENDS += \ + @(SDK_USER)/src/vfs/@(SDK_VERSION) \ + @(SDK_USER)/src/libc/@(SDK_VERSION) \ + @(SDK_USER)/src/stdcxx/@(SDK_VERSION) \ + _/src/dosbox-libretro \ + _/src/retro_frontend \ + _/raw/soyuz \ + include_rules -: |> wget --quiet https://ce.gl/ports/dist/soyuz/%o |> soyuz.zip +: |> wget --quiet https://ce.gl/ports/dist/soyuz/%o |> soyuz.zip {zip} -: soyuz.zip \ +: {zip} \ |> unzip %f -d soyuz ; tar cf %o dosbox.conf soyuz ; rm -r soyuz \ - |> $(DEPOT_RAW_DIR)/%d/@(DEPOT_VERSION)/soyuz.tar {raw} + |> soyuz.tar {tar} -: runtime |> !runtime_to_depot |> {package} -: archives |> !archives_to_depot |> {package} +: {tar} |> !collect_raw |> +: |> !raw |> -: {package} |> !publish_pkg |> -: {raw} |> !publish_raw |> +: runtime |> !collect_pkg_runtime |> +: |> !pkg |> endif diff --git a/runtimes/soyuz/archives b/runtimes/soyuz/archives deleted file mode 100644 index b47f81c38..000000000 --- a/runtimes/soyuz/archives +++ /dev/null @@ -1,6 +0,0 @@ -@SDK_USER@/src/vfs/@SDK_VERSION@ -@SDK_USER@/src/libc/@SDK_VERSION@ -@SDK_USER@/src/stdcxx/@SDK_VERSION@ -@DEPOT_USER@/src/libretro-dosbox/@DEPOT_VERSION@ -@DEPOT_USER@/src/retro_frontend/@DEPOT_VERSION@ -@DEPOT_USER@/raw/soyuz/@DEPOT_VERSION@ diff --git a/runtimes/templeos/Tupfile b/runtimes/templeos/Tupfile index 45d625df1..0e8651f2f 100644 --- a/runtimes/templeos/Tupfile +++ b/runtimes/templeos/Tupfile @@ -1,3 +1,5 @@ +TARGET_NAME = templeos + include_rules PKG_DEPENDS += \ diff --git a/runtimes/topbench/Tupfile b/runtimes/topbench/Tupfile index c0c19dc1f..c94ea172c 100644 --- a/runtimes/topbench/Tupfile +++ b/runtimes/topbench/Tupfile @@ -1,4 +1,15 @@ ifndef CONFIG_NO_NETWORK + +TARGET_NAME = topbench + +PKG_DEPENDS += \ + @(SDK_USER)/src/vfs/@(SDK_VERSION) \ + @(SDK_USER)/src/libc/@(SDK_VERSION) \ + @(SDK_USER)/src/stdcxx/@(SDK_VERSION) \ + _/src/dosbox-libretro \ + _/src/retro_frontend \ + _/raw/topbench \ + include_rules : |> wget --quiet https://github.com/MobyGamer/TOPBENCH/releases/download/0.38.h/%o |> TOPBV38H.ZIP {zip} @@ -7,10 +18,10 @@ include_rules |> unzip -L %f -d tmp ; tar cf %o -C tmp . ; rm -r tmp \ |> $(DEPOT_RAW_DIR)/%d/@(DEPOT_VERSION)/TOPBV38H.tar {raw} -: runtime |> !runtime_to_depot |> {package} -: archives |> !archives_to_depot |> {package} +: {zip} |> !collect_raw |> +: |> !raw |> -: {package} |> !publish_pkg |> -: {raw} |> !publish_raw |> +: runtime |> !collect_pkg_runtime |> +: |> !pkg |> endif diff --git a/runtimes/topbench/archives b/runtimes/topbench/archives deleted file mode 100644 index 127d09eb3..000000000 --- a/runtimes/topbench/archives +++ /dev/null @@ -1,6 +0,0 @@ -@SDK_USER@/src/vfs/@SDK_VERSION@ -@SDK_USER@/src/libc/@SDK_VERSION@ -@SDK_USER@/src/stdcxx/@SDK_VERSION@ -@DEPOT_USER@/src/libretro-dosbox/@DEPOT_VERSION@ -@DEPOT_USER@/src/retro_frontend/@DEPOT_VERSION@ -@DEPOT_USER@/raw/topbench/@DEPOT_VERSION@