From 7a42d852518f36cdede0074b8f9e7b72f4686314 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Mon, 17 May 2021 01:20:40 +0200 Subject: [PATCH] Add Megadrive SDK --- .gitmodules | 3 +++ Dockerfile.in | 5 ++--- Makefile | 26 ++++++++++++++++++-------- sgdk | 1 + 4 files changed, 24 insertions(+), 11 deletions(-) create mode 160000 sgdk diff --git a/.gitmodules b/.gitmodules index 7cfc6ef..12246e2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "psn00bsdk"] path = psn00bsdk url = https://github.com/Bensuperpc/psn00bsdk-docker.git +[submodule "sgdk"] + path = sgdk + url = https://github.com/Stephane-D/SGDK.git diff --git a/Dockerfile.in b/Dockerfile.in index 811df09..25dfbbe 100644 --- a/Dockerfile.in +++ b/Dockerfile.in @@ -1,6 +1,5 @@ -FROM debian:stable-20210408-slim -#FROM debian:stretch-20190326-slim -MAINTAINER Matt McCormick "matt.mccormick@kitware.com" +FROM debian:buster-slim +MAINTAINER Bensuperpc "bensuperpc@gmail.com" #include "common.debian" diff --git a/Makefile b/Makefile index 5717caf..f1d40de 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ EXT_GEN_IMAGES = linux-armv8-rpi4.full linux-armv8-rpi3.full linux-armv7-rpi2.fu GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(EXT_GEN_IMAGES)) $(addsuffix /Dockerfile,$(GEN_IMAGES)) # These images are expected to have explicit rules for *both* build and testing -NON_STANDARD_IMAGES = web-wasm manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 pvsneslib cc65 psn00bsdk +NON_STANDARD_IMAGES = web-wasm manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 pvsneslib cc65 psn00bsdk sgdk DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool common.dockcross common.lib common.label-and-env @@ -55,6 +55,8 @@ TAG := $(shell date '+%Y%m%d')-$(shell git rev-parse --short HEAD) # images: base $(IMAGES) +all: base $(IMAGES) + # # test: This target ensures all IMAGES are built and run the associated tests # @@ -85,8 +87,7 @@ cc65: cc65/Dockerfile cc65 cc65.test: cc65 - $(DOCKER) build -t $(ORG)/cc65:latest \ - cc65 + echo "Not working now" # # pvsneslib @@ -96,8 +97,7 @@ pvsneslib: pvsneslib/Dockerfile pvsneslib pvsneslib.test: pvsneslib - $(DOCKER) build -t $(ORG)/pvsneslib:latest \ - pvsneslib + echo "Not working now" # # psn00bsdk @@ -107,8 +107,18 @@ psn00bsdk: psn00bsdk/Dockerfile psn00bsdk psn00bsdk.test: psn00bsdk - $(DOCKER) build -t $(ORG)/psn00bsdk:latest \ - psn00bsdk + echo "Not working now" + +# +# sgdk +# +sgdk: sgdk/Dockerfile + $(DOCKER) build -t $(ORG)/sgdk:latest \ + sgdk + +sgdk.test: sgdk + echo "Not working now" +# docker run --rm -v $(PWD)/sgdk/sample/sonic:/src $(ORG)/sgdk # # web-wasm @@ -263,7 +273,7 @@ $(STANDARD_IMAGES): %: %/Dockerfile base # .SECONDEXPANSION: $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@) - $(DOCKER) run $(RM) bensuperpc/$(basename $@) > $(BIN)/dockcross-$(basename $@) && chmod +x $(BIN)/dockcross-$(basename $@) + $(DOCKER) run $(RM) $(ORG)/$(basename $@) > $(BIN)/dockcross-$(basename $@) && chmod +x $(BIN)/dockcross-$(basename $@) $(BIN)/dockcross-$(basename $@) python3 test/run.py $($@_ARGS) .SECONDEXPANSION: diff --git a/sgdk b/sgdk new file mode 160000 index 0000000..f156c37 --- /dev/null +++ b/sgdk @@ -0,0 +1 @@ +Subproject commit f156c37e16393d6fadb3ca1097a1e34d222d1396