Changes to use a top-level variable for the Oscar compiler uses.

This commit is contained in:
John Schneiderman 2024-08-07 21:24:40 +02:00
parent eab2a490f4
commit 586fab6b6b
13 changed files with 72 additions and 93 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,8 +1,6 @@
CC=../../bin/oscar64
CFLAGS=
%.prg: %.c
$(CC) $(CFLAGS) $<
@echo "Compiling sample file" $<
@$(OSCAR64_CC) $(OSCAR64_CFLAGS) $<
all: helloworld.prg