diff --git a/autotest/makefile b/autotest/makefile index 801f13b..25c626c 100644 --- a/autotest/makefile +++ b/autotest/makefile @@ -1,5 +1,3 @@ -CC=../bin/oscar64 -CXX=$(CC) SRCS=$(filter-out opp_part1.cpp opp_part2.cpp, $(wildcard *.c *.cpp)) EXES=$(patsubst %.c,%,$(SRCS)) EXES:=$(patsubst %.cpp,%,$(EXES)) @@ -7,44 +5,44 @@ EXES:=$(patsubst %.cpp,%,$(EXES)) all: $(EXES) %: %.c - $(CC) -e -bc $< - $(CC) -e -n $< - $(CC) -e -O2 -bc $< - $(CC) -e -O2 -n $< - $(CC) -e -O0 -bc $< - $(CC) -e -O0 -n $< - $(CC) -e -Os -bc $< - $(CC) -e -Os -n $< - $(CC) -e -O3 -bc $< - $(CC) -e -O3 -n $< + $(OSCAR64_CC) -e -bc $< + $(OSCAR64_CC) -e -n $< + $(OSCAR64_CC) -e -O2 -bc $< + $(OSCAR64_CC) -e -O2 -n $< + $(OSCAR64_CC) -e -O0 -bc $< + $(OSCAR64_CC) -e -O0 -n $< + $(OSCAR64_CC) -e -Os -bc $< + $(OSCAR64_CC) -e -Os -n $< + $(OSCAR64_CC) -e -O3 -bc $< + $(OSCAR64_CC) -e -O3 -n $< %: %.cpp - $(CXX) -e -bc $< - $(CXX) -e -n $< - $(CXX) -e -O2 -bc $< - $(CXX) -e -O2 -n $< - $(CXX) -e -O0 -bc $< - $(CXX) -e -O0 -n $< - $(CXX) -e -Os -bc $< - $(CXX) -e -Os -n $< - $(CXX) -e -O3 -bc $< - $(CXX) -e -O3 -n $< + $(OSCAR64_CXX) -e -bc $< + $(OSCAR64_CXX) -e -n $< + $(OSCAR64_CXX) -e -O2 -bc $< + $(OSCAR64_CXX) -e -O2 -n $< + $(OSCAR64_CXX) -e -O0 -bc $< + $(OSCAR64_CXX) -e -O0 -n $< + $(OSCAR64_CXX) -e -Os -bc $< + $(OSCAR64_CXX) -e -Os -n $< + $(OSCAR64_CXX) -e -O3 -bc $< + $(OSCAR64_CXX) -e -O3 -n $< # testb bitshifttest: bitshifttest.c - $(CC) -e -bc $< - $(CC) -e -bc -O2 $< - $(CC) -e -bc -O0 $< - $(CC) -e -bc -Os $< - $(CC) -e -bc -O3 $< - $(CC) -e -n $< + $(OSCAR64_CC) -e -bc $< + $(OSCAR64_CC) -e -bc -O2 $< + $(OSCAR64_CC) -e -bc -O0 $< + $(OSCAR64_CC) -e -bc -Os $< + $(OSCAR64_CC) -e -bc -O3 $< + $(OSCAR64_CC) -e -n $< # testn stripedarraytest: stripedarraytest.c - $(CC) -e -O2 -n $< - $(CC) -e -O0 -n $< - $(CC) -e -Os -n $< - $(CC) -e -O3 -n $< + $(OSCAR64_CC) -e -O2 -n $< + $(OSCAR64_CC) -e -O0 -n $< + $(OSCAR64_CC) -e -Os -n $< + $(OSCAR64_CC) -e -O3 -n $< clean: @$(RM) *.asm *.bcs *.int *.lbl *.map *.prg diff --git a/make/makefile b/make/makefile index 504d421..52444c8 100644 --- a/make/makefile +++ b/make/makefile @@ -7,6 +7,9 @@ CXX = c++ CPPFLAGS = -g -O2 -std=c++11 -Wno-switch SED = /usr/bin/sed REMOVE_FORCE_ALL = $(RM) --recursive --dir +export OSCAR64_CC = $(project_dir)/bin/oscar64 +export OSCAR64_CFLAGS = +export OSCAR64_CXX = $(project_dir)/bin/oscar64 ifdef WINDIR @@ -38,14 +41,14 @@ all: --prep-build-dir compiler samples tests @echo "Transforming file" $@ "..." @set -e; \ $(RM) $(srcdir)/$@; \ - $(CC) -MM $(CPPFLAGS) $< > $(srcdir)/$@.$$$$; \ + @$(CC) -MM $(CPPFLAGS) $< > $(srcdir)/$@.$$$$; \ $(SED) 's,\($*\)\.o[ :]*,\1.o $(srcdir)/$@ : ,g' < $(srcdir)/$@.$$$$ > $(srcdir)/$@; \ $(RM) $(srcdir)/$@.$$$$ compiler: $(objects) @echo "Linking compiler..." - $(CXX) $(CPPFLAGS) $(objects) $(linklibs) -o $(project_dir)/bin/oscar64 + @$(CXX) $(CPPFLAGS) $(objects) $(linklibs) -o $(project_dir)/bin/oscar64 .PHONY : clean diff --git a/samples/fractals/makefile b/samples/fractals/makefile index 3f415c8..f30655a 100644 --- a/samples/fractals/makefile +++ b/samples/fractals/makefile @@ -1,16 +1,14 @@ -CC=../../bin/oscar64 -CFLAGS=-n - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: mbtext.prg mbtext.prg mbhires.prg mbmulti.prg mbmulti3d.prg mbfixed.prg mbzoom.prg mbfixed.prg: mbfixed.c - $(CC) $(CFLAGS) -O3 $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) -O3 $< mbzoom.prg: mbzoom.c - $(CC) $(CFLAGS) -O3 $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) -O3 $< clean: @$(RM) *.asm *.int *.lbl *.map *.prg diff --git a/samples/games/makefile b/samples/games/makefile index 38582fc..1d31617 100644 --- a/samples/games/makefile +++ b/samples/games/makefile @@ -1,19 +1,17 @@ -CC=../../bin/oscar64 -CFLAGS=-n - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: snake.prg lander.prg maze3d.prg missile.prg breakout.prg connectfour.prg hscrollshmup.prg snake.prg: snake.c - $(CC) $< + @$(OSCAR64_CC) $< missile.prg: missile.c - $(CC) $(CFLAGS) -O3 $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) -O3 $< hscrollshmup.prg: hscrollshmup.c - $(CC) $(CFLAGS) -O2 $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) -O2 $< clean: @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs diff --git a/samples/hires/makefile b/samples/hires/makefile index 559cedc..6f3e13d 100644 --- a/samples/hires/makefile +++ b/samples/hires/makefile @@ -1,13 +1,11 @@ -CC=../../bin/oscar64 -CFLAGS=-n - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: splitscreen.prg func3d.prg lines.prg polygon.prg bitblit.prg cube3d.prg fractaltree.prg qsort.prg splitscreen.prg: splitscreen.c - $(CC) $< + @$(OSCAR64_CC) $< clean: @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs diff --git a/samples/hiresmc/makefile b/samples/hiresmc/makefile index c9c7f04..61cd4d1 100644 --- a/samples/hiresmc/makefile +++ b/samples/hiresmc/makefile @@ -1,8 +1,6 @@ -CC=../../bin/oscar64 -CFLAGS=-n - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: func3d.prg polygon.prg floodfill.prg paint.prg diff --git a/samples/kernalio/makefile b/samples/kernalio/makefile index 48021a2..910e6b0 100644 --- a/samples/kernalio/makefile +++ b/samples/kernalio/makefile @@ -1,8 +1,6 @@ -CC=../../bin/oscar64 -CFLAGS= - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: diskdir.prg filewrite.prg fileread.prg charwrite.prg charread.prg hireswrite.prg hiresread.prg diff --git a/samples/memmap/makefile b/samples/memmap/makefile index 8f59a02..00d168a 100644 --- a/samples/memmap/makefile +++ b/samples/memmap/makefile @@ -1,29 +1,27 @@ -CC=../../bin/oscar64 -CFLAGS= - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: largemem.prg allmem.prg charsetlo.prg charsethi.prg charsetcopy.prg charsetexpand.prg \ charsetload.prg easyflash.crt easyflashreloc.crt easyflashshared.crt tsr.prg overlay.prg charsetload.prg: charsetload.c ../resources/charset.bin - $(CC) $(CFLAGS) $< -d64=charsetload.d64 -fz=../resources/charset.bin + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< -d64=charsetload.d64 -fz=../resources/charset.bin easyflash.crt: easyflash.c - $(CC) $(CFLAGS) $< -n -tf=crt + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< -n -tf=crt easyflashreloc.crt: easyflashreloc.c - $(CC) $(CFLAGS) $< -n -tf=crt + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< -n -tf=crt easyflashshared.crt: easyflashshared.c - $(CC) $(CFLAGS) $< -n -tf=crt + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< -n -tf=crt tsr.prg: tsr.c - $(CC) $(CFLAGS) $< -n -dNOFLOAT -dNOLONG + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< -n -dNOFLOAT -dNOLONG overlay.prg: overlay.c - $(CC) $(CFLAGS) $< -n -d64=overlay.d64 + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< -n -d64=overlay.d64 clean: @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs *.d64 *.crt diff --git a/samples/particles/makefile b/samples/particles/makefile index 0e8aaa2..e461620 100644 --- a/samples/particles/makefile +++ b/samples/particles/makefile @@ -1,8 +1,6 @@ -CC=../../bin/oscar64 -CFLAGS=-n - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: fireworks_ptr.prg fireworks_hires.prg fireworks_stripe.prg diff --git a/samples/rasterirq/makefile b/samples/rasterirq/makefile index 8a62c01..165b064 100644 --- a/samples/rasterirq/makefile +++ b/samples/rasterirq/makefile @@ -1,13 +1,11 @@ -CC=../../bin/oscar64 -CFLAGS= - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: colorbars.prg openborder.prg textcrawler.prg movingbars.prg movingbars.prg: movingbars.c - $(CC) $(CFLAGS) $< -n + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< -n clean: @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs diff --git a/samples/scrolling/makefile b/samples/scrolling/makefile index e7c13cd..c1e97f0 100644 --- a/samples/scrolling/makefile +++ b/samples/scrolling/makefile @@ -1,8 +1,6 @@ -CC=../../bin/oscar64 -CFLAGS=-n - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: bigfont.prg tunnel.prg grid2d.prg colorram.prg cgrid8way.prg diff --git a/samples/sprites/makefile b/samples/sprites/makefile index f3593c6..f4ad05b 100644 --- a/samples/sprites/makefile +++ b/samples/sprites/makefile @@ -1,16 +1,14 @@ -CC=../../bin/oscar64 -CFLAGS=-n - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: joycontrol.prg multiplexer.prg creditroll.prg sprmux32.prg sprmux64.prg joycontrol.prg: joycontrol.c - $(CC) $< + @$(OSCAR64_CC) $< sprmux32.prg: sprmux32.c - $(CC) $(CFLAGS) $< -O2 -dVSPRITES_MAX=32 -dNUM_IRQS=28 + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< -O2 -dVSPRITES_MAX=32 -dNUM_IRQS=28 clean: @$(RM) *.asm *.int *.lbl *.map *.prg *.bcs diff --git a/samples/stdio/makefile b/samples/stdio/makefile index bc7e790..e33d992 100644 --- a/samples/stdio/makefile +++ b/samples/stdio/makefile @@ -1,8 +1,6 @@ -CC=../../bin/oscar64 -CFLAGS= - %.prg: %.c - $(CC) $(CFLAGS) $< + @echo "Compiling sample file" $< + @$(OSCAR64_CC) $(OSCAR64_CFLAGS) $< all: helloworld.prg