From 06054478e510c53575735aa7f15ccf002a681948 Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Sun, 26 Feb 2023 23:59:02 +0000 Subject: [PATCH] Improve buildability --- .devcontainer/Dockerfile | 3 +-- Makefile | 3 +++ README.md | 13 +++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d7f85dfa..b421913e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,6 @@ FROM ghcr.io/n64-tools/gcc-toolchain-mips64:latest -# Avoid warnings by switching to noninteractive -ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y python3 RUN git clone --branch trunk https://github.com/dragonminded/libdragon.git --depth 1 ./sources/libdragon diff --git a/Makefile b/Makefile index f28cad1a..3378f5a2 100644 --- a/Makefile +++ b/Makefile @@ -35,4 +35,7 @@ clean: $(shell rm -rf ./$(BUILD_DIR)) .PHONY: clean +finalize-sc64: + $(shell cd ./$(BUILD_DIR) && python3 ../tools/finalize.py ./$(EXE_NAME).z64) + -include $(wildcard $(BUILD_DIR)/*.d) diff --git a/README.md b/README.md index ef1db234..e9e5b32b 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ **This repo and its documentation is currently experimental and subject to change without notice.** ## Aims -* Support as many flashcarts as possible -* Be open source using preferably MIT licensed third party licenced libraries where possible. +* Support as many N64 FlashCarts as possible. +* Be open source using preferably MIT licensed third party licensed libraries where possible. * Be testable, where possible using CTest, but if not, in an emulated environment. -* Encourage active development from community members and flashcart owners. +* Encourage active development from community members and N64 FlashCart owners. ## Basic usage @@ -46,8 +46,8 @@ Save it to the root folder on your SD card. ### ED64 -Not Currently not suppported, but there is an aim to do so. -This will likely replace AltraOSv1 +Not currently not supported, but there is an aim to do so. +The aim is to replace [Altra64](https://github.com/networkfusion/altra64) and [ED64-UnofficialOS](https://github.com/n64-tools/ED64-UnofficialOS-binaries). # Developer documentation @@ -57,5 +57,6 @@ You can use a dev container in VSCode. `ms-vscode.makefile-tools` will help (installed automatically in dev container). TODO: it does not yet work with `F5`: see https://devblogs.microsoft.com/cppblog/now-announcing-makefile-support-in-visual-studio-code/ -WORKAROUND: in the terminal, use make directly `make all` +WORKAROUND: in the terminal, use make directly `make all` then `make finalize-sc64` +The ROM will be found in the `build` directory.