rpi: add option to use mesa or new vendor gl libs

This commit is contained in:
gizmo98 2018-04-11 21:42:57 +02:00
parent b09356f3f7
commit 4a7d0b9e7e
2 changed files with 13 additions and 8 deletions

View File

@ -302,7 +302,7 @@ void linux_fix_personality() {
}
void linux_rpi2_init() {
#if (HOST_OS == OS_LINUX) && !defined(_ANDROID) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN)
#if (HOST_OS == OS_LINUX) && !defined(_ANDROID) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) && defined(TARGET_VIDEOCORE)
void* handle;
void (*rpi_bcm_init)(void);

View File

@ -130,14 +130,19 @@ else ifneq (,$(findstring lincpp,$(platform)))
# Raspberry Pi 2
else ifneq (,$(findstring rpi2,$(platform)))
MFLAGS += -marm -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard -funroll-loops
ASFLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=softfp
CFLAGS += -D TARGET_BEAGLE -D TARGET_LINUX_ARMELv7 -DARM_HARDFP -fsingle-precision-constant
INCS += -I/opt/vc/include/ -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads -I../linux-deps/include
LIBS += -L/opt/vc/lib/ -L../linux-deps/lib -lbcm_host
USE_OMX := 1
USE_DISPMANX := 1
USE_GLES := 1
ifneq (,$(findstring mesa,$(platform)))
USE_SDL := 1
USE_GLES := 1
else
INCS += -I/opt/vc/include/ -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
LIBS += -L/opt/vc/lib/ -lbcm_host
LIBS += -lbrcmEGL -lbrcmGLESv2
CFLAGS += -D TARGET_VIDEOCORE
CXXFLAGS += -DGLES
USE_OMX := 1
USE_DISPMANX := 1
endif
undefine USE_X11
# BeagleBone Black