Cleanup
This commit is contained in:
parent
f45758e845
commit
dded47f921
3 changed files with 7 additions and 6 deletions
|
@ -530,7 +530,7 @@ if(BACKEND_RENDERER MATCHES "OpenGL3")
|
||||||
target_link_libraries(CSE2 PRIVATE glad)
|
target_link_libraries(CSE2 PRIVATE glad)
|
||||||
|
|
||||||
find_package(OpenGL REQUIRED)
|
find_package(OpenGL REQUIRED)
|
||||||
target_link_libraries(CSE2 PRIVATE OpenGL::GL ${CMAKE_DL_LIBS})
|
target_link_libraries(CSE2 PRIVATE OpenGL::GL)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(BACKEND_RENDERER MATCHES "OpenGLES2")
|
if(BACKEND_RENDERER MATCHES "OpenGLES2")
|
||||||
|
|
|
@ -70,14 +70,11 @@ endif()
|
||||||
|
|
||||||
# glad
|
# glad
|
||||||
|
|
||||||
if(NOT TARGET glad)
|
|
||||||
add_subdirectory("../external/glad" "glad" EXCLUDE_FROM_ALL)
|
add_subdirectory("../external/glad" "glad" EXCLUDE_FROM_ALL)
|
||||||
endif()
|
|
||||||
|
|
||||||
target_link_libraries(DoConfig PRIVATE glad)
|
target_link_libraries(DoConfig PRIVATE glad)
|
||||||
|
|
||||||
find_package(OpenGL REQUIRED)
|
find_package(OpenGL REQUIRED)
|
||||||
target_link_libraries(DoConfig PRIVATE OpenGL::GL ${CMAKE_DL_LIBS})
|
target_link_libraries(DoConfig PRIVATE OpenGL::GL)
|
||||||
|
|
||||||
# GLFW3
|
# GLFW3
|
||||||
|
|
||||||
|
|
4
external/glad/CMakeLists.txt
vendored
4
external/glad/CMakeLists.txt
vendored
|
@ -1,5 +1,7 @@
|
||||||
cmake_minimum_required(VERSION 3.12)
|
cmake_minimum_required(VERSION 3.12)
|
||||||
|
|
||||||
|
if(NOT TARGET glad)
|
||||||
|
|
||||||
project(glad LANGUAGES C)
|
project(glad LANGUAGES C)
|
||||||
|
|
||||||
add_library(glad
|
add_library(glad
|
||||||
|
@ -10,3 +12,5 @@ add_library(glad
|
||||||
|
|
||||||
target_include_directories(glad PUBLIC "include")
|
target_include_directories(glad PUBLIC "include")
|
||||||
target_link_libraries(glad PRIVATE ${CMAKE_DL_LIBS})
|
target_link_libraries(glad PRIVATE ${CMAKE_DL_LIBS})
|
||||||
|
|
||||||
|
endif(NOT TARGET glad)
|
||||||
|
|
Loading…
Add table
Reference in a new issue