From 8465b50712519e99633965248f0d2e0630a4bc1b Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Mon, 14 Oct 2024 21:50:06 -0700 Subject: [PATCH] makefile fixes, update efinity version --- .gitlab-ci.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7174efb..db995ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ build: - linux script: # - source init_env.sh - - module load efinity/2023.1 + - module load efinity/2024.1 - make after_script: - cat hw/super6502_fpga/outflow/super6502_fpga.err.log diff --git a/Makefile b/Makefile index 46cd215..ef47ba5 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ $(CC65): $(MAKE) -C sw/toolchain/cc65 -j $(shell nproc) $(INIT_HEX): $(CC65) script/generate_rom_image.py $(HEX) - python script/generate_rom_image.py -i $(HEX) -o $@ + python3 script/generate_rom_image.py -i $(HEX) -o $@ # This should get dependencies of rom, not be phony .PHONY: $(HEX)