Skip to content

Commit

Permalink
Fix OpenGL_ES support on GNU/Linux. (#415)
Browse files Browse the repository at this point in the history
* Fix OpenGL_ES support on GNU/Linux.

* Use -lGLESv3 on Android only, and -lGLESv2 on other Linux based systems.
  • Loading branch information
vanfanel authored Jan 30, 2024
1 parent 36f114c commit 3892965
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
7 changes: 6 additions & 1 deletion extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,12 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
)
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_package(GLEW REQUIRED)
target_link_libraries(ImGui PUBLIC ${OPENGL_glx_LIBRARY} ${OPENGL_opengl_LIBRARY} GLEW::GLEW)
if (DEFINED USE_OPENGLES)
target_link_libraries(ImGui PUBLIC ${OPENGL_GLESv2_LIBRARY} GLEW::GLEW)
add_compile_definitions(IMGUI_IMPL_OPENGL_ES3)
else()
target_link_libraries(ImGui PUBLIC ${OPENGL_glx_LIBRARY} ${OPENGL_opengl_LIBRARY} GLEW::GLEW)
endif()
endif()

#=================== tinyxml2 ===================
Expand Down
9 changes: 7 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,13 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
endif()

if (USE_OPENGLES)
find_library(OPENGLES_LIBRARY GLESv3)
target_link_libraries(libultraship PRIVATE GLESv3)
if (CMAKE_SYSTEM_NAME STREQUAL "Android")
find_library(OPENGLES_LIBRARY GLESv3)
target_link_libraries(libultraship PRIVATE GLESv3)
else()
find_library(OPENGLES_LIBRARY GLESv2)
target_link_libraries(libultraship PRIVATE GLESv2)
endif()
endif()

#=================== Compile Options & Defs ===================
Expand Down

0 comments on commit 3892965

Please sign in to comment.