frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds the tests to the all target. 

Silences the cleaning targets.
This commit is contained in:
John Schneiderman 2024-08-07 20:39:05 +02:00
parent 95992df67d
commit eab2a490f4
14 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotest/makefile
View File

@ -47,4 +47,4 @@ stripedarraytest: stripedarraytest.c
$(CC) -e -O3 -n $< $(CC) -e -O3 -n $<
clean: clean:
$(RM) *.asm *.bcs *.int *.lbl *.map *.prg @$(RM) *.asm *.bcs *.int *.lbl *.map *.prg

14
make/makefile
View File

@ -26,7 +26,7 @@ else
endif endif
all: --prep-build-dir compiler samples all: --prep-build-dir compiler samples tests
%.o: $(project_dir)/oscar64/%.cpp %.o: $(project_dir)/oscar64/%.cpp
@ -53,18 +53,24 @@ clean :
@$(RM) $(srcdir)/*.o @$(RM) $(srcdir)/*.o
@$(RM) $(srcdir)/*.d @$(RM) $(srcdir)/*.d
@$(RM) $(project_dir)/bin/oscar64 @$(RM) $(project_dir)/bin/oscar64
$(MAKE) -C $(project_dir)/samples clean @$(MAKE) -C $(project_dir)/samples clean
@$(MAKE) -C $(project_dir)/autotest clean
.PHONY : distclean .PHONY : distclean
distclean : distclean :
@$(REMOVE_FORCE_ALL) $(srcdir) @$(REMOVE_FORCE_ALL) $(srcdir)
@$(REMOVE_FORCE_ALL) $(project_dir)/bin @$(REMOVE_FORCE_ALL) $(project_dir)/bin
$(MAKE) -C $(project_dir)/samples clean @$(MAKE) -C $(project_dir)/samples clean
@$(MAKE) -C $(project_dir)/autotest clean
samples: compiler samples: compiler
$(MAKE) -C $(project_dir)/samples all @$(MAKE) -C $(project_dir)/samples all
tests: compiler
@$(MAKE) -C $(project_dir)/autotest all
ifeq ($(UNAME_S), Darwin) ifeq ($(UNAME_S), Darwin)

2
samples/fractals/makefile
View File

@ -13,4 +13,4 @@ mbzoom.prg: mbzoom.c
$(CC) $(CFLAGS) -O3 $< $(CC) $(CFLAGS) -O3 $<
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg @$(RM) *.asm *.int *.lbl *.map *.prg

2
samples/games/makefile
View File

@ -16,4 +16,4 @@ hscrollshmup.prg: hscrollshmup.c
$(CC) $(CFLAGS) -O2 $< $(CC) $(CFLAGS) -O2 $<
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg *.bcs @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs

2
samples/hires/makefile
View File

@ -10,4 +10,4 @@ splitscreen.prg: splitscreen.c
$(CC) $< $(CC) $<
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg *.bcs @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs

2
samples/hiresmc/makefile
View File

@ -7,4 +7,4 @@ CFLAGS=-n
all: func3d.prg polygon.prg floodfill.prg paint.prg all: func3d.prg polygon.prg floodfill.prg paint.prg
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg @$(RM) *.asm *.int *.lbl *.map *.prg

2
samples/kernalio/makefile
View File

@ -7,4 +7,4 @@ CFLAGS=
all: diskdir.prg filewrite.prg fileread.prg charwrite.prg charread.prg hireswrite.prg hiresread.prg all: diskdir.prg filewrite.prg fileread.prg charwrite.prg charread.prg hireswrite.prg hiresread.prg
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg *.bcs @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs

44
samples/makefile
View File

@ -1,25 +1,25 @@
all: all:
$(MAKE) -C fractals @$(MAKE) -C fractals
$(MAKE) -C games @$(MAKE) -C games
$(MAKE) -C hires @$(MAKE) -C hires
$(MAKE) -C hiresmc @$(MAKE) -C hiresmc
$(MAKE) -C particles @$(MAKE) -C particles
$(MAKE) -C kernalio @$(MAKE) -C kernalio
$(MAKE) -C memmap @$(MAKE) -C memmap
$(MAKE) -C rasterirq @$(MAKE) -C rasterirq
$(MAKE) -C scrolling @$(MAKE) -C scrolling
$(MAKE) -C sprites @$(MAKE) -C sprites
$(MAKE) -C stdio @$(MAKE) -C stdio
clean: clean:
$(MAKE) -C fractals $@ @$(MAKE) -C fractals $@
$(MAKE) -C games $@ @$(MAKE) -C games $@
$(MAKE) -C hires $@ @$(MAKE) -C hires $@
$(MAKE) -C hiresmc $@ @$(MAKE) -C hiresmc $@
$(MAKE) -C particles $@ @$(MAKE) -C particles $@
$(MAKE) -C kernalio $@ @$(MAKE) -C kernalio $@
$(MAKE) -C memmap $@ @$(MAKE) -C memmap $@
$(MAKE) -C rasterirq $@ @$(MAKE) -C rasterirq $@
$(MAKE) -C scrolling $@ @$(MAKE) -C scrolling $@
$(MAKE) -C sprites $@ @$(MAKE) -C sprites $@
$(MAKE) -C stdio $@ @$(MAKE) -C stdio $@

2
samples/memmap/makefile
View File

@ -26,4 +26,4 @@ overlay.prg: overlay.c
$(CC) $(CFLAGS) $< -n -d64=overlay.d64 $(CC) $(CFLAGS) $< -n -d64=overlay.d64
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg *.bcs *.d64 *.crt @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs *.d64 *.crt

2
samples/particles/makefile
View File

@ -7,4 +7,4 @@ CFLAGS=-n
all: fireworks_ptr.prg fireworks_hires.prg fireworks_stripe.prg all: fireworks_ptr.prg fireworks_hires.prg fireworks_stripe.prg
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg @$(RM) *.asm *.int *.lbl *.map *.prg

2
samples/rasterirq/makefile
View File

@ -10,4 +10,4 @@ movingbars.prg: movingbars.c
$(CC) $(CFLAGS) $< -n $(CC) $(CFLAGS) $< -n
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg *.bcs @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs

2
samples/scrolling/makefile
View File

@ -7,4 +7,4 @@ CFLAGS=-n
all: bigfont.prg tunnel.prg grid2d.prg colorram.prg cgrid8way.prg all: bigfont.prg tunnel.prg grid2d.prg colorram.prg cgrid8way.prg
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg @$(RM) *.asm *.int *.lbl *.map *.prg

2
samples/sprites/makefile
View File

@ -13,4 +13,4 @@ sprmux32.prg: sprmux32.c
$(CC) $(CFLAGS) $< -O2 -dVSPRITES_MAX=32 -dNUM_IRQS=28 $(CC) $(CFLAGS) $< -O2 -dVSPRITES_MAX=32 -dNUM_IRQS=28
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg *.bcs @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs

2
samples/stdio/makefile
View File

@ -7,4 +7,4 @@ CFLAGS=
all: helloworld.prg all: helloworld.prg
clean: clean:
$(RM) *.asm *.int *.lbl *.map *.prg *.bcs @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs