From 856780ccb0eb88da08e3597ee09bf12b0d034b96 Mon Sep 17 00:00:00 2001 From: Dario48 Date: Sat, 23 May 2026 16:37:08 +0200 Subject: [PATCH] working version (flake does not build correctly, should just use make) --- .gitignore | 1 + Makefile | 15 +++++++++++++-- README | 2 +- flake.nix | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bc5799b..5241e10 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ smb.nes smb.nes.ndx obj/nes/smbdishl.o obj/nes/smb.d +chr/ src/smb_chr.chr .direnv diff --git a/Makefile b/Makefile index b0f4485..0134b17 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,22 @@ debug: OBJ_DEBUG_ARGS = --create-dep obj/nes/smb.d -v -g debug: ROM_DEBUG_ARGS = -Wl --dbgfile,smb.nes.dbg debug: build -obj/nes/smbdishl.o: src/smbdishl.s +obj/nes/smbdishl.o: src/smbdishl.s src/smb_chr.chr $(cl65) -t none -c $(OBJ_DEBUG_ARGS) --include-dir src -o $@ $< smb.nes smb.map: obj/nes/smbdishl.o src/nes.cfg - $(cl65) -t none -c --mapfile smb.map $(ROM_DEBUG_ARGS) -o smb.nes -C src/nes.cfg $< + $(cl65) -t none --mapfile smb.map $(ROM_DEBUG_ARGS) -o smb.nes -C src/nes.cfg $< + +src/smb_chr.chr: + if [ -s chr/smb_chr.chr ]; then \ + if [ -s src/smb_chr.chr ]; then \ + cmp -s $@ chr/smb_chr.chr || cp chr/smb_chr.chr $@ \ + else \ + cp chr/smb_chr.chr \ + fi \ + else \ + [ -s src/smb_chr.chr ] || $(error missing chr)\ + fi clean: rm -f smb.nes.dbg smb.map smb.nes smb.nes.ndx obj/nes/smbdishl.o obj/nes/smb.d diff --git a/README b/README index 5fe1e1b..a5ab072 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Building: -NOTE: "src/smb_chr.chr" is required to assemble. (Not included.) +NOTE: "chr/smb_chr.chr" is required to assemble. (Not included.) Run either `make`, or `make debug` diff --git a/flake.nix b/flake.nix index 1b42222..af0ef69 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,10 @@ }; devShells.default = pkgs.mkShellNoCC { inputsFrom = [ self'.packages.default ]; - packages = with pkgs; [ nesrx ]; + packages = with pkgs; [ + nesrx + fceux + ]; }; packages.default = pkgs.stdenvNoCC.mkDerivation { name = "smbOneOne";