From 4a7d0b9e7e823547676df63472b4bcf11cad4003 Mon Sep 17 00:00:00 2001 From: gizmo98 Date: Wed, 11 Apr 2018 21:42:57 +0200 Subject: [PATCH] rpi: add option to use mesa or new vendor gl libs --- core/linux/common.cpp | 2 +- shell/linux/Makefile | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/core/linux/common.cpp b/core/linux/common.cpp index f956d93a8..e27f7c086 100644 --- a/core/linux/common.cpp +++ b/core/linux/common.cpp @@ -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); diff --git a/shell/linux/Makefile b/shell/linux/Makefile index ad65b13a2..7f5b8911f 100644 --- a/shell/linux/Makefile +++ b/shell/linux/Makefile @@ -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