From: Paulo Duarte <paulo.duarte@robertwalters.com>
Date: Sat, 15 May 2021 23:30:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'niklasekstrom/autoconfig_a314' into wip-crap
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5762d343fa675103bf067938887b6f726cf8e149;p=pistorm

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

# Conflicts:
#	.gitignore
#	emulator.c
#	run.sh
---

5762d343fa675103bf067938887b6f726cf8e149
diff --cc Makefile
index 892730e,270e6ed..96f5d2e
--- a/Makefile
+++ b/Makefile
@@@ -34,24 -12,13 +34,25 @@@ EXE 
  EXEPATH = ./
  
  .CFILES   = $(MAINFILES) $(MUSASHIFILES) $(MUSASHIGENCFILES)
- .OFILES   = $(.CFILES:%.c=%.o)
+ .OFILES   = $(.CFILES:%.c=%.o) a314.o
  
  CC        = gcc
+ CPP       = g++
  WARNINGS  = -Wall -Wextra -pedantic
 -CFLAGS    = $(WARNINGS) -march=armv7 -O3
 -LFLAGS    = $(WARNINGS)
 +
 +# 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
 +# 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`
 +
 +# Pi3 standard raylib stuff
 +LFLAGS    = $(WARNINGS) -L/opt/vc/lib -L./raylib -lraylib -lbrcmGLESv2 -lbrcmEGL -lbcm_host
 +# 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)