Merge remote-tracking branch 'niklasekstrom/autoconfig_a314' into wip-crap

[pistorm] / Makefile

diff --git a/Makefile b/Makefile
index 892730e3a10b891d827f6eb36eea3b3c6074aafc..96f5d2e1122600be77df1c06e250b4871ae455f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,10 @@ EXE =
 EXEPATH = ./
 
 .CFILES   = $(MAINFILES) $(MUSASHIFILES) $(MUSASHIGENCFILES)
-.OFILES   = $(.CFILES:%.c=%.o)
+.OFILES   = $(.CFILES:%.c=%.o) a314.o
 
 CC        = gcc
+CPP       = g++
 WARNINGS  = -Wall -Wextra -pedantic
 
 # Pi3 CFLAGS
@@ -63,12 +64,14 @@ all: $(TARGET)
 clean:
        rm -f $(DELETEFILES)
 
-
 $(TARGET): $(MUSASHIGENHFILES) $(.OFILES) Makefile
-       $(CC) -o $@ $(.OFILES) -O3 -pthread $(LFLAGS) -lm
+       $(CPP) -o $@ $(.OFILES) -O3 -pthread $(LFLAGS) -lm
 
 $(MUSASHIGENCFILES) $(MUSASHIGENHFILES): $(MUSASHIGENERATOR)$(EXE)
        $(EXEPATH)$(MUSASHIGENERATOR)$(EXE)
 
 $(MUSASHIGENERATOR)$(EXE):  $(MUSASHIGENERATOR).c
        $(CC) -o  $(MUSASHIGENERATOR)$(EXE)  $(MUSASHIGENERATOR).c
+
+a314.o: a314/a314.cc a314/a314.h m68k.h
+       $(CPP) a314/a314.cc -O3 -c