X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=ed7fbf60074be6693e108203e864e62978707697;hb=HEAD;hp=5f6e6b00234793d4aa18f6b7ae79e3c2ce49ca71;hpb=909dfa74537960236316b740d2efbac9c081714b;p=pistorm

diff --git a/Makefile b/Makefile
index 5f6e6b0..ed7fbf6 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ MAINFILES        = emulator.c \
 	platforms/amiga/amiga-autoconf.c \
 	platforms/amiga/amiga-platform.c \
 	platforms/amiga/amiga-registers.c \
+	platforms/mac68k/mac68k-platform.c \
 	platforms/dummy/dummy-platform.c \
 	platforms/dummy/dummy-registers.c \
 	platforms/amiga/Gayle.c \
@@ -21,7 +22,8 @@ MAINFILES        = emulator.c \
 	platforms/amiga/piscsi/piscsi.c \
 	platforms/amiga/pistorm-dev/pistorm-dev.c \
 	platforms/amiga/net/pi-net.c \
-	platforms/shared/rtc.c
+	platforms/shared/rtc.c \
+	platforms/shared/common.c
 
 MUSASHIFILES     = m68kcpu.c m68kdasm.c softfloat/softfloat.c softfloat/softfloat_fpsp.c
 MUSASHIGENCFILES = m68kops.c
@@ -34,34 +36,46 @@ EXE =
 EXEPATH = ./
 
 .CFILES   = $(MAINFILES) $(MUSASHIFILES) $(MUSASHIGENCFILES)
-.OFILES   = $(.CFILES:%.c=%.o)
+.OFILES   = $(.CFILES:%.c=%.o) a314/a314.o
 
 CC        = gcc
+CXX       = g++
 WARNINGS  = -Wall -Wextra -pedantic
-CFLAGS    = $(WARNINGS) -I. -I./raylib -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DEGL_NO_X11 -DPLATFORM_DRM
+
+# Pi3 CFLAGS
+CFLAGS    = $(WARNINGS) -I. -I./raylib -I./raylib/external -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -lstdc++
+# Pi4 CFLAGS
+#CFLAGS    = $(WARNINGS) -I. -I./raylib_pi4_test -I./raylib_pi4_test/external -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+
 # Old SDL2 stuff
 #LFLAGS    = $(WARNINGS) `sdl2-config --libs`
-# Pi4 experimental crap
-#LFLAGS    = $(WARNINGS) -I./raylib_pi4_test -L./raylib_pi4_test -lraylib -lGLESv2 -lEGL -lrt -lgbm -ldrm -ldl
+
 # Pi3 standard raylib stuff
-LFLAGS    = $(WARNINGS) -L/opt/vc/lib -L./raylib -lraylib -lbrcmGLESv2 -lbrcmEGL -lbcm_host
+LFLAGS    = $(WARNINGS) -L/opt/vc/lib -L./raylib -lraylib -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lstdc++
+# Pi4 experimental crap
+# Graphics output on the Pi4 sort of REQUIRES X11 to be running, otherwise it is insanely slow and useless.
+#LFLAGS    = $(WARNINGS) -L/usr/local/lib -L./raylib_pi4_test -lraylib -lGL -ldl -lrt -lX11 -DPLATFORM_DESKTOP
 
 TARGET = $(EXENAME)$(EXE)
 
-DELETEFILES = $(MUSASHIGENCFILES) $(MUSASHIGENHFILES) $(.OFILES) $(TARGET) $(MUSASHIGENERATOR)$(EXE)
+DELETEFILES = $(MUSASHIGENCFILES) $(MUSASHIGENHFILES) $(.OFILES) $(.OFILES:%.o=%.d) $(TARGET) $(MUSASHIGENERATOR)$(EXE)
 
 
-all: $(TARGET)
+all: $(MUSASHIGENCFILES) $(MUSASHIGENHFILES) $(TARGET)
 
 clean:
 	rm -f $(DELETEFILES)
 
+$(TARGET):  $(MUSAHIGENCFILES:%.c=%.o) $(.CFILES:%.c=%.o) a314/a314.o
+	$(CC) -o $@ $^ -O3 -pthread $(LFLAGS) -lm -lstdc++
 
-$(TARGET): $(MUSASHIGENHFILES) $(.OFILES) Makefile
-	$(CC) -o $@ $(.OFILES) -O3 -pthread $(LFLAGS) -lm
+a314/a314.o: a314/a314.cc a314/a314.h
+	$(CXX) -MMD -MP -c -o a314/a314.o -O3 a314/a314.cc -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -I..
 
 $(MUSASHIGENCFILES) $(MUSASHIGENHFILES): $(MUSASHIGENERATOR)$(EXE)
 	$(EXEPATH)$(MUSASHIGENERATOR)$(EXE)
 
 $(MUSASHIGENERATOR)$(EXE):  $(MUSASHIGENERATOR).c
 	$(CC) -o  $(MUSASHIGENERATOR)$(EXE)  $(MUSASHIGENERATOR).c
+
+-include $(.CFILES:%.c=%.d) $(MUSASHIGENCFILES:%.c=%.d) a314/a314.d $(MUSASHIGENERATOR).d