Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-21 21:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake: use correct Raspberry Pi library names & fix generic GLES support

Browse source 
* For BCMHOST build, use brcmEGL / brcmGLESv2 libraries, and don't look at
  Mesa includes (so libraspberrypi-dev and libgles*-mesa-dev can coexist).
* If overridden via -DGLES=On, don't present vendor includes to build to
  make absolutely sure that the Mesa includes are used.

Fixes stretch vendor library building & generic Mesa GLES compatibility.
This commit is contained in:
Conn O'Griofa 2017-10-04 04:19:02 +00:00
parent 0974f1c6c7
commit d6adf6b71e
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
CMake/Packages/FindOpenGLES.cmake
View file

@ -42,21 +42,33 @@ ELSE (WIN32)
ELSE(APPLE) ELSE(APPLE)
FIND_PATH(OPENGLES_INCLUDE_DIR GLES/gl.h IF (DEFINED BCMHOST)
/usr/openwin/share/include FIND_PATH(OPENGLES_INCLUDE_DIR GLES/gl.h
/opt/graphics/OpenGL/include /usr/X11R6/include /opt/vc/include
/usr/include NO_DEFAULT_PATH
/opt/vc/include )
)
FIND_LIBRARY(OPENGLES_gl_LIBRARY FIND_LIBRARY(OPENGLES_gl_LIBRARY
NAMES GLES_CM GLESv1_CM NAMES brcmGLESv2
PATHS /opt/graphics/OpenGL/lib PATHS /opt/vc/lib
/usr/openwin/lib )
/usr/shlib /usr/X11R6/lib
/usr/lib ELSE (DEFINED BCMHOST)
/opt/vc/lib
) FIND_PATH(OPENGLES_INCLUDE_DIR GLES/gl.h
/usr/openwin/share/include
/opt/graphics/OpenGL/include /usr/X11R6/include
/usr/include
)
FIND_LIBRARY(OPENGLES_gl_LIBRARY
NAMES GLES_CM GLESv1_CM
PATHS /opt/graphics/OpenGL/lib
/usr/openwin/lib
/usr/shlib /usr/X11R6/lib
/usr/lib
)
ENDIF (DEFINED BCMHOST)
# On Unix OpenGL most certainly always requires X11. # On Unix OpenGL most certainly always requires X11.
# Feel free to tighten up these conditions if you don't # Feel free to tighten up these conditions if you don't

2
CMakeLists.txt
View file

@ -178,7 +178,7 @@ endif()
if(DEFINED BCMHOST) if(DEFINED BCMHOST)
LIST(APPEND COMMON_LIBRARIES LIST(APPEND COMMON_LIBRARIES
bcm_host bcm_host
EGL brcmEGL
${OPENGLES_LIBRARIES} ${OPENGLES_LIBRARIES}
) )
else() else()