Update Makefile and README.md

This commit is contained in:
beeanyew
2021-11-10 17:40:32 +01:00
parent 48c66af00d
commit d59df941fe
2 changed files with 6 additions and 10 deletions

View File

@@ -44,19 +44,14 @@ CC = gcc
CXX = g++
WARNINGS = -Wall -Wextra -pedantic
# Pi3 CFLAGS
CFLAGS = $(WARNINGS) -I. -I./raylib -I/opt/vc/include/ -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -lstdc++ $(ACFLAGS)
# Pi4 CFLAGS
#CFLAGS = $(WARNINGS) -DRPI4_TEST -I. -I./raylib_pi4_test -I/opt/vc/include/ -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -lstdc++ $(ACFLAGS)
# Old SDL2 stuff
#LFLAGS = $(WARNINGS) `sdl2-config --libs`
ifeq ($(PLATFORM),PI3_BULLSEYE)
LFLAGS = $(WARNINGS) -L/usr/local/lib -L/opt/vc/lib -L./raylib_drm -lraylib -lGLESv2 -lEGL -lgbm -ldrm -ldl -lstdc++ -lvcos -lvchiq_arm -lvchostif -lasound
LFLAGS = $(WARNINGS) -L/usr/local/lib -L/opt/vc/lib -L./raylib_drm -lraylib -lGLESv2 -lEGL -lgbm -ldrm -ldl -lstdc++ -lvcos -lvchiq_arm -lvchostif -lasound
CFLAGS = $(WARNINGS) -I. -I./raylib -I/opt/vc/include/ -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -lstdc++ $(ACFLAGS)
else ifeq ($(PLATFORM),PI4)
LFLAGS = $(WARNINGS) -L/usr/local/lib -L/opt/vc/lib -L./raylib_pi4_test -lraylib -lGLESv2 -lEGL -lgbm -ldrm -ldl -lstdc++ -lvcos -lvchiq_arm -lvchostif -lasound
CFLAGS = $(WARNINGS) -DRPI4_TEST -I. -I./raylib_pi4_test -I/opt/vc/include/ -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -lstdc++ $(ACFLAGS)
else
CFLAGS = $(WARNINGS) -I. -I./raylib -I/opt/vc/include/ -march=armv8-a -mfloat-abi=hard -mfpu=neon-fp-armv8 -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -lstdc++ $(ACFLAGS)
LFLAGS = $(WARNINGS) -L/opt/vc/lib -L./raylib -lraylib -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lstdc++ -lvcos -lvchiq_arm -lasound
endif

View File

@@ -72,7 +72,8 @@ Now the final steps to get things up and running, all of this is done from a com
* `git clone https://github.com/captain-amygdala/pistorm.git`
* `cd pistorm`
* `make`
**Important note:** If you are using Raspberry Pi OS "Bullseye', you need to run `make PLATFORM=PI3_BULLSEYE` for the emulator to compile successfully since the main graphics backend has changed from dispmanx to DRM.
**Important note:** If you are using **Raspberry Pi OS "Bullseye'**, you need to run `make PLATFORM=PI3_BULLSEYE` for the emulator to compile successfully since the main graphics backend has changed from dispmanx to DRM.
In addition, you also need to run `sudo apt-get install libdrm-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev`, as the DRM OpenGL/ES libraries are for some reason not included with the distro by default.
Next up, follow the steps for installing the FPGA bitstream update below. (Scroll down.)