diff --git a/Samples/HelloWorld/Makefile b/Samples/HelloWorld/Makefile index f39873339b..850c74b3f0 100644 --- a/Samples/HelloWorld/Makefile +++ b/Samples/HelloWorld/Makefile @@ -1,15 +1,21 @@ # path to RETRO68 -RETRO68=../../Retro68-build/toolchain +RETRO68=../../../Retro68-build/toolchain PREFIX=$(RETRO68)/m68k-unknown-elf CC=$(RETRO68)/bin/m68k-unknown-elf-gcc CXX=$(RETRO68)/bin/m68k-unknown-elf-g++ -MAKEAPPL=$(RETRO68)/bin/MakeAPPL +REZ=$(RETRO68)/bin/Rez LDFLAGS=-lRetroConsole +RINCLUDES=$(PREFIX)/RIncludes +REZFLAGS=-I$(RINCLUDES) HelloWorld.bin HelloWorld.APPL HelloWorld.dsk: HelloWorld.flt - $(MAKEAPPL) -c HelloWorld.flt -o HelloWorld + $(REZ) $(REZFLAGS) \ + -DFLT_FILE_NAME="\"HelloWorld.flt\"" "$(RINCLUDES)/Retro68APPL.r" \ + -t "APPL" -c "????" \ + -o HelloWorld.bin --cc HelloWorld.APPL --cc HelloWorld.dsk + HelloWorld.flt: hello.o $(CXX) $< -o $@ $(LDFLAGS) # C++ used for linking because RetroConsole needs it diff --git a/Samples/Raytracer/Makefile b/Samples/Raytracer/Makefile index 8d6b4f1e81..8fab2b8986 100644 --- a/Samples/Raytracer/Makefile +++ b/Samples/Raytracer/Makefile @@ -2,15 +2,18 @@ # Double-check RETRO68 variable below and run 'make'. # path to RETRO68 -RETRO68=../../Retro68-build/toolchain +RETRO68=../../../Retro68-build/toolchain PREFIX=$(RETRO68)/m68k-unknown-elf CC=$(RETRO68)/bin/m68k-unknown-elf-gcc CXX=$(RETRO68)/bin/m68k-unknown-elf-g++ +REZ=$(RETRO68)/bin/Rez MAKEAPPL=$(RETRO68)/bin/MakeAPPL CXXFLAGS=-std=c++11 LDFLAGS=-Wl,-gc-sections -lm +RINCLUDES=$(PREFIX)/RIncludes +REZFLAGS=-I$(RINCLUDES) all: Raytracer.bin Raytracer2.bin FixedBenchmark.bin .PHONY: all clean @@ -22,19 +25,28 @@ clean: rm -f fixed.o raytracer.o raytracer2.o fixedbenchmark.o Raytracer.bin Raytracer.APPL Raytracer.dsk: Raytracer.flt - $(MAKEAPPL) -c Raytracer.flt -o Raytracer + $(REZ) $(REZFLAGS) \ + -DFLT_FILE_NAME="\"Raytracer.flt\"" "$(RINCLUDES)/Retro68APPL.r" \ + -t "APPL" -c "????" \ + -o Raytracer.bin --cc Raytracer.APPL --cc Raytracer.dsk Raytracer.flt: raytracer.o $(CC) $^ -o $@ $(LDFLAGS) Raytracer2.bin Raytracer2.APPL Raytracer2.dsk: Raytracer2.flt - $(MAKEAPPL) -c Raytracer2.flt -o Raytracer2 + $(REZ) $(REZFLAGS) \ + -DFLT_FILE_NAME="\"Raytracer2.flt\"" "$(RINCLUDES)/Retro68APPL.r" \ + -t "APPL" -c "????" \ + -o Raytracer2.bin --cc Raytracer2.APPL --cc Raytracer2.dsk Raytracer2.flt: raytracer2.o fixed.o $(CXX) $^ -o $@ $(LDFLAGS) FixedBenchmark.bin FixedBenchmark.APPL FixedBenchmark.dsk: FixedBenchmark.flt - $(MAKEAPPL) -c FixedBenchmark.flt -o FixedBenchmark + $(REZ) $(REZFLAGS) \ + -DFLT_FILE_NAME="\"FixedBenchmark.flt\"" "$(RINCLUDES)/Retro68APPL.r" \ + -t "APPL" -c "????" \ + -o FixedBenchmark.bin --cc FixedBenchmark.APPL --cc FixedBenchmark.dsk FixedBenchmark.flt: fixedbenchmark.o fixed.o $(CXX) $^ -o $@ -lRetroConsole $(LDFLAGS)