From 53fed67bbcc19c1866a4f67a9c38c32d1a6e188f Mon Sep 17 00:00:00 2001 From: mrdudz Date: Sun, 30 Jan 2022 02:07:50 +0100 Subject: [PATCH] fix pathes --- .github/workflows/build-on-pull-request.yml | 4 ++++ targettest/accelerator/Makefile | 8 ++++---- targettest/apple2/Makefile | 8 ++++---- targettest/atari/Makefile | 8 ++++---- targettest/atari5200/Makefile | 8 ++++---- targettest/cbm/Makefile | 8 ++++---- targettest/gamate/Makefile | 8 ++++---- targettest/pce/Makefile | 8 ++++---- 8 files changed, 32 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml index 5c39082bd..aa76f1f64 100644 --- a/.github/workflows/build-on-pull-request.yml +++ b/.github/workflows/build-on-pull-request.yml @@ -127,3 +127,7 @@ jobs: - name: Build app (release) run: msbuild src\cc65.sln -t:rebuild -property:Configuration=Release + +# TODO: build targettest cbm subdir for all cbm targets +# TODO: build targettest atari subdir for all atari targets +# TODO: build targettest apple2 subdir for all apple2 targets diff --git a/targettest/accelerator/Makefile b/targettest/accelerator/Makefile index 527b13f33..90871f20c 100644 --- a/targettest/accelerator/Makefile +++ b/targettest/accelerator/Makefile @@ -20,10 +20,10 @@ ifdef CC65_HOME CL = $(CC65_HOME)/bin/cl65 LD = $(CC65_HOME)/bin/ld65 else - AS := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65) - CC := $(if $(wildcard ../../../bin/cc65*),../../../bin/cc65,cc65) - CL := $(if $(wildcard ../../../bin/cl65*),../../../bin/cl65,cl65) - LD := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65) + AS := $(if $(wildcard ../../bin/ca65*),../../bin/ca65,ca65) + CC := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65) + CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) + LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) endif all: c64-scpu-test.prg c128-scpu-test.prg c64dtv-test.prg \ diff --git a/targettest/apple2/Makefile b/targettest/apple2/Makefile index f8167b47c..15a4075af 100644 --- a/targettest/apple2/Makefile +++ b/targettest/apple2/Makefile @@ -23,10 +23,10 @@ ifdef CC65_HOME CL = $(CC65_HOME)/bin/cl65 LD = $(CC65_HOME)/bin/ld65 else - AS := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65) - CC := $(if $(wildcard ../../../bin/cc65*),../../../bin/cc65,cc65) - CL := $(if $(wildcard ../../../bin/cl65*),../../../bin/cl65,cl65) - LD := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65) + AS := $(if $(wildcard ../../bin/ca65*),../../bin/ca65,ca65) + CC := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65) + CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) + LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) endif all: hgrshow hgrtest dhgrshow diff --git a/targettest/atari/Makefile b/targettest/atari/Makefile index 18ddf55ce..05388ddd7 100644 --- a/targettest/atari/Makefile +++ b/targettest/atari/Makefile @@ -21,10 +21,10 @@ ifdef CC65_HOME CL = $(CC65_HOME)/bin/cl65 LD = $(CC65_HOME)/bin/ld65 else - AS := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65) - CC := $(if $(wildcard ../../../bin/cc65*),../../../bin/cc65,cc65) - CL := $(if $(wildcard ../../../bin/cl65*),../../../bin/cl65,cl65) - LD := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65) + AS := $(if $(wildcard ../../bin/ca65*),../../bin/ca65,ca65) + CC := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65) + CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) + LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) endif all: charmapping.xex defdev.xex displaylist.xex mem.xex multi.xex ostype.xex \ diff --git a/targettest/atari5200/Makefile b/targettest/atari5200/Makefile index 3a8114975..532bb815e 100644 --- a/targettest/atari5200/Makefile +++ b/targettest/atari5200/Makefile @@ -21,10 +21,10 @@ ifdef CC65_HOME CL = $(CC65_HOME)/bin/cl65 LD = $(CC65_HOME)/bin/ld65 else - AS := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65) - CC := $(if $(wildcard ../../../bin/cc65*),../../../bin/cc65,cc65) - CL := $(if $(wildcard ../../../bin/cl65*),../../../bin/cl65,cl65) - LD := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65) + AS := $(if $(wildcard ../../bin/ca65*),../../bin/ca65,ca65) + CC := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65) + CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) + LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) endif all: hello diff --git a/targettest/cbm/Makefile b/targettest/cbm/Makefile index a7646c2d9..3a4eff86f 100644 --- a/targettest/cbm/Makefile +++ b/targettest/cbm/Makefile @@ -24,10 +24,10 @@ ifdef CC65_HOME CL = $(CC65_HOME)/bin/cl65 LD = $(CC65_HOME)/bin/ld65 else - AS := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65) - CC := $(if $(wildcard ../../../bin/cc65*),../../../bin/cc65,cc65) - CL := $(if $(wildcard ../../../bin/cl65*),../../../bin/cl65,cl65) - LD := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65) + AS := $(if $(wildcard ../../bin/ca65*),../../bin/ca65,ca65) + CC := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65) + CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) + LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) endif all: petscii.prg cbmdir-test.prg diff --git a/targettest/gamate/Makefile b/targettest/gamate/Makefile index a14b8a854..69ac30dc5 100644 --- a/targettest/gamate/Makefile +++ b/targettest/gamate/Makefile @@ -21,10 +21,10 @@ ifdef CC65_HOME CL = $(CC65_HOME)/bin/cl65 LD = $(CC65_HOME)/bin/ld65 else - AS := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65) - CC := $(if $(wildcard ../../../bin/cc65*),../../../bin/cc65,cc65) - CL := $(if $(wildcard ../../../bin/cl65*),../../../bin/cl65,cl65) - LD := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65) + AS := $(if $(wildcard ../../bin/ca65*),../../bin/ca65,ca65) + CC := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65) + CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) + LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) endif all: audiotest.bin lcdtest.bin ctest.bin diff --git a/targettest/pce/Makefile b/targettest/pce/Makefile index f91f0eed8..695fed0a5 100644 --- a/targettest/pce/Makefile +++ b/targettest/pce/Makefile @@ -21,10 +21,10 @@ ifdef CC65_HOME CL = $(CC65_HOME)/bin/cl65 LD = $(CC65_HOME)/bin/ld65 else - AS := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65) - CC := $(if $(wildcard ../../../bin/cc65*),../../../bin/cc65,cc65) - CL := $(if $(wildcard ../../../bin/cl65*),../../../bin/cl65,cl65) - LD := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65) + AS := $(if $(wildcard ../../bin/ca65*),../../bin/ca65,ca65) + CC := $(if $(wildcard ../../bin/cc65*),../../bin/cc65,cc65) + CL := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) + LD := $(if $(wildcard ../../bin/ld65*),../../bin/ld65,ld65) endif .PHONY: all clean test