Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ignored OpenGLES2 include path and cmake warning

Browse Source
This commit is contained in:
sfan5 2021-04-16 23:39:16 +02:00
parent a106bfd456
commit 52c0384bd1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/Modules/FindOpenGLES2.cmake
View File

@ -42,7 +42,7 @@ else()
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(OPENGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR) find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)
find_path(EGL_INCLUDE_DIR EGL/egl.h find_path(EGL_INCLUDE_DIR EGL/egl.h
PATHS /usr/openwin/share/include PATHS /usr/openwin/share/include
@ -59,7 +59,6 @@ else()
/usr/lib /usr/lib
) )
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR) find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)
endif() endif()

4
src/CMakeLists.txt
View File

@ -513,6 +513,10 @@ include_directories(
${PROJECT_SOURCE_DIR}/script ${PROJECT_SOURCE_DIR}/script
) )
if(ENABLE_GLES)
include_directories(${OPENGLES2_INCLUDE_DIR} ${EGL_INCLUDE_DIR})
endif()
if(USE_GETTEXT) if(USE_GETTEXT)
include_directories(${GETTEXT_INCLUDE_DIR}) include_directories(${GETTEXT_INCLUDE_DIR})
endif() endif()