Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11538 from akien-mga/cmake-arm-linux-opengl

Browse Source 
CMake: Link against OpenGL when using EGL but not GLES2
This commit is contained in:
Henrik Rydgård 2018-11-06 16:17:04 +01:00 committed by GitHub
commit b6742af077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -183,6 +183,10 @@ if(NOT OPENGL_LIBRARIES AND USING_GLES2)
set(OPENGL_LIBRARIES GLESv2 EGL) set(OPENGL_LIBRARIES GLESv2 EGL)
endif() endif()
if(NOT OPENGL_LIBRARIES)
find_package(OpenGL REQUIRED)
endif()
if(USING_EGL) if(USING_EGL)
if(NOT EGL_LIBRARIES) if(NOT EGL_LIBRARIES)
set(EGL_LIBRARIES EGL) set(EGL_LIBRARIES EGL)
@ -190,10 +194,6 @@ if(USING_EGL)
set(OPENGL_LIBRARIES ${OPENGL_LIBRARIES} ${EGL_LIBRARIES}) set(OPENGL_LIBRARIES ${OPENGL_LIBRARIES} ${EGL_LIBRARIES})
endif() endif()
if(NOT OPENGL_LIBRARIES)
find_package(OpenGL REQUIRED)
endif()
find_package(SDL2) find_package(SDL2)
include(FindThreads) include(FindThreads)