From 34a61cf57ea3593c60e211a6f1dafc525ea04567 Mon Sep 17 00:00:00 2001 From: Conn O'Griofa Date: Mon, 16 Oct 2017 19:07:12 +0100 Subject: [PATCH] RPI: use new vendor graphics library names Now required to build on recent Raspberry Pi firmware images (Raspbian stretch). --- CMakeLists.txt | 5 ++++- cmake/Toolchains/raspberry.armv6.cmake | 3 ++- cmake/Toolchains/raspberry.armv7.cmake | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb3742805d..2347128fbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -742,7 +742,10 @@ elseif(TARGET SDL2::SDL2) set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm) set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY}) elseif(USING_EGL) - set(nativeExtraLibs ${nativeExtraLibs} pthread EGL) + if(NOT EGL_LIBRARIES) + set(EGL_LIBRARIES EGL) + endif() + set(nativeExtraLibs ${nativeExtraLibs} pthread ${EGL_LIBRARIES}) endif() set(TargetBin PPSSPPSDL) elseif(WIN32) diff --git a/cmake/Toolchains/raspberry.armv6.cmake b/cmake/Toolchains/raspberry.armv6.cmake index 54182a6a6a..3d93462dab 100644 --- a/cmake/Toolchains/raspberry.armv6.cmake +++ b/cmake/Toolchains/raspberry.armv6.cmake @@ -19,7 +19,8 @@ set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${ARCH_FLAGS}" CACHE STRING "" FORCE) set(CMAKE_EXE_LINKER_FLAGS "-L/opt/vc/lib" CACHE STRING "" FORCE) -set(OPENGL_LIBRARIES GLESv2 bcm_host) +set(OPENGL_LIBRARIES brcmGLESv2 bcm_host) +set(EGL_LIBRARIES brcmEGL) set(USING_GLES2 ON) set(USING_FBDEV ON) diff --git a/cmake/Toolchains/raspberry.armv7.cmake b/cmake/Toolchains/raspberry.armv7.cmake index 870a3d4489..eaff3d479d 100644 --- a/cmake/Toolchains/raspberry.armv7.cmake +++ b/cmake/Toolchains/raspberry.armv7.cmake @@ -20,7 +20,8 @@ set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${ARCH_FLAGS}" CACHE STRING "" FORCE) set(CMAKE_EXE_LINKER_FLAGS "-L/opt/vc/lib" CACHE STRING "" FORCE) -set(OPENGL_LIBRARIES GLESv2 bcm_host) +set(OPENGL_LIBRARIES brcmGLESv2 bcm_host) +set(EGL_LIBRARIES brcmEGL) set(USING_GLES2 ON) set(USING_FBDEV ON) set(ARMV7 ON)