From 00264c6081c1b73f06adfeede1f0227aaa7a15d4 Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Mon, 27 Feb 2023 00:48:22 +0000 Subject: [PATCH] Minor improvements --- .devcontainer/devcontainer.json | 42 +++++++++++++++++++-------------- Makefile | 2 +- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 21a57648..0b501d22 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,20 +1,26 @@ { - "name": "N64FlashcartMenu", - // If you prefer, you can use the source files and adjust them they are located, with the same names in ./sources. This will alow you to customize them and add anything you may need on top. - "dockerFile": "Dockerfile", - "context": ".", - "mounts": [ - "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind", - // Keep command history - "source=nano-bashhistory,target=/home/vscode/commandhistory,type=volume", - ], - // Set *default* container specific settings.json values on container create. - "settings": { - }, - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "ms-vsliveshare.vsliveshare-pack", - "streetsidesoftware.code-spell-checker", - "ms-vscode.makefile-tools" - ] + "name": "N64FlashcartMenu", + // If you prefer, you can use the source files and adjust them they are located, with the same names in ./sources. This will alow you to customize them and add anything you may need on top. + "dockerFile": "Dockerfile", + "context": ".", + "mounts": [ + "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind", + // Keep command history + "source=nano-bashhistory,target=/home/vscode/commandhistory,type=volume"//, + // Could this handle USB? + // "type=bind,source=/dev/bus/usb,target=/dev/bus/usb" + ], + "customizations": { + "vscode": { + // Set *default* container specific settings.json values on container create. + "settings": { + }, + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "ms-vsliveshare.vsliveshare-pack", + "streetsidesoftware.code-spell-checker", + "ms-vscode.makefile-tools" + ] + } + } } diff --git a/Makefile b/Makefile index 3378f5a2..c69780f2 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ clean: $(shell rm -rf ./$(BUILD_DIR)) .PHONY: clean -finalize-sc64: + finalize-sc64: $(shell cd ./$(BUILD_DIR) && python3 ../tools/finalize.py ./$(EXE_NAME).z64) -include $(wildcard $(BUILD_DIR)/*.d)