Update Tupfiles for Nix
This commit is contained in:
parent
336a66982b
commit
cb5ef3a1be
|
@ -128,14 +128,7 @@ DHALL = dhall
|
|||
|
||||
!index_pkg = |> |>
|
||||
|
||||
!render_runtime = | $(VERSIONS_SED_FILE) |> ^o render %d 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)/<pkg> \
|
||||
!render_runtime = |> |>
|
||||
|
||||
LIBRETRO_COMM_DIR = $(TUP_CWD)/libretro-common
|
||||
GIT_VERSION = `git describe --always`
|
||||
|
|
|
@ -10,7 +10,6 @@ include upstream/Makefile.common
|
|||
: {core} |> !collect_bin |>
|
||||
: |> !bin |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime}
|
||||
: |> !pkg |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !index_pkg |>
|
||||
|
|
|
@ -21,7 +21,6 @@ DEFINES += $(FLAGS)
|
|||
: {core} |> !collect_bin |>
|
||||
: |> !bin |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |>
|
||||
: |> !pkg |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !index_pkg |>
|
||||
|
|
|
@ -18,7 +18,6 @@ include upstream/Makefile.common
|
|||
PKG_DEPENDS += \
|
||||
@(PUBLIC_SRC_STDCXX) \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime}
|
||||
: |> !pkg |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !index_pkg |>
|
||||
|
|
|
@ -46,7 +46,6 @@ DEFINES += \
|
|||
PKG_DEPENDS += \
|
||||
@(PUBLIC_SRC_STDCXX) \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime}
|
||||
: |> !pkg |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !index_pkg |>
|
||||
|
|
|
@ -47,5 +47,4 @@ PKG_DEPENDS += \
|
|||
@(PUBLIC_SRC_STDCXX) \
|
||||
_/raw/bluemsx \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |>
|
||||
: |> !pkg |>
|
||||
|
|
|
@ -27,5 +27,4 @@ DEFINES += -DHAVE_MMAP
|
|||
PKG_DEPENDS += \
|
||||
@(PUBLIC_SRC_STDCXX) \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |>
|
||||
: |> !pkg |>
|
||||
|
|
|
@ -41,5 +41,4 @@ SOURCES_CXX += $(LIBRETRO_COMM_DIR)/libco/genode.cpp
|
|||
PKG_DEPENDS += \
|
||||
@(PUBLIC_SRC_STDCXX) \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |>
|
||||
: |> !pkg |>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
CORE_PKGS += libc libm
|
||||
CORE_PKGS += libc libm stdcxx
|
||||
|
||||
DEFINES += -O2 -DNDEBUG
|
||||
DEFINES += -DWANT_GRIFFIN
|
||||
|
@ -15,7 +15,6 @@ DEFINES += -Wno-write-strings
|
|||
: {core} |> !collect_bin |>
|
||||
: |> !bin |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime}
|
||||
: |> !pkg |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !index_pkg |>
|
||||
|
|
|
@ -19,7 +19,6 @@ include upstream/Makefile.common
|
|||
PKG_DEPENDS += \
|
||||
@(PUBLIC_SRC_STDCXX) \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime}
|
||||
: |> !pkg |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !index_pkg |>
|
||||
|
|
|
@ -24,5 +24,4 @@ include upstream/Makefile.common
|
|||
PKG_DEPENDS += \
|
||||
@(PUBLIC_SRC_STDCXX) \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |>
|
||||
: |> !pkg |>
|
||||
|
|
|
@ -20,7 +20,6 @@ CFLAGS += -fomit-frame-pointer
|
|||
: {libretro_objs} |> !libretro_core_link |> {core}
|
||||
: {core} |> !collect_bin |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |>
|
||||
|
||||
: |> !bin |>
|
||||
: |> !pkg |>
|
||||
|
|
|
@ -18,5 +18,4 @@ CXXFLAGS += -fno-rtti -fno-exceptions
|
|||
: {core} |> !collect_bin |>
|
||||
: |> !bin |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |>
|
||||
: |> !pkg |>
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
RAW_VERSION = 2019-01-21
|
||||
: $(CORE_DIR)/DiskImage/Oberon-$(RAW_VERSION).dsk |> !collect_raw |>
|
||||
: |> !raw |>
|
||||
|
||||
CORE_PKGS += libc
|
||||
|
||||
|
@ -11,10 +10,7 @@ include upstream/Libretro/Makefile.common
|
|||
|
||||
: {libretro_objs} |> !libretro_core_link |> {core}
|
||||
: {core} |> !collect_bin |>
|
||||
: |> !bin |>
|
||||
|
||||
PKG_DEPENDS += \
|
||||
_/raw/oberon \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |>
|
||||
: |> !pkg |>
|
||||
|
|
|
@ -21,7 +21,6 @@ CXXFLAGS += -DRIGHTSHIFT_IS_SAR -DALLOW_CPU_OVERCLOCK
|
|||
PKG_DEPENDS += \
|
||||
@(PUBLIC_SRC_STDCXX) \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime}
|
||||
: |> !pkg |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !index_pkg |>
|
||||
|
|
|
@ -28,7 +28,6 @@ include upstream/Makefile.common
|
|||
PKG_DEPENDS += \
|
||||
ehmry/raw/quake_shareware/1.06 \
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |> {runtime}
|
||||
: |> !pkg |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !index_pkg |>
|
||||
|
|
|
@ -26,5 +26,4 @@ CFLAGS += -O3 -DNDEBUG
|
|||
: {core} |> !collect_bin |>
|
||||
: |> !bin |>
|
||||
|
||||
: $(TUP_CWD)/pkg.dhall |> !render_runtime |>
|
||||
: |> !pkg |>
|
||||
|
|
Loading…
Reference in New Issue