Browse Source

Upgrade glad to glad2 w/ OpenGL 4.6 loader

master
C. J. Howard 1 year ago
parent
commit
a43280049e
8 changed files with 5286 additions and 3302 deletions
  1. +1
    -1
      CMakeLists.txt
  2. +1
    -1
      modules/antkeeper-source
  3. +9
    -3
      modules/glad/CMakeLists.txt
  4. +0
    -1150
      modules/glad/glad.c
  5. +0
    -2147
      modules/glad/glad.h
  6. +0
    -0
      modules/glad/include/KHR/khrplatform.h
  7. +3641
    -0
      modules/glad/include/glad/gl.h
  8. +1634
    -0
      modules/glad/src/gl.c

+ 1
- 1
CMakeLists.txt View File

@ -219,7 +219,7 @@ ExternalProject_Add(glad
"-DCMAKE_C_FLAGS='${CMAKE_C_FLAGS}'"
"-DCMAKE_C_FLAGS_DEBUG='${CMAKE_C_FLAGS_DEBUG}'"
"-DCMAKE_C_FLAGS_RELEASE='${CMAKE_C_FLAGS_RELEASE}'"
BUILD_ALWAYS 0)
BUILD_ALWAYS 1)
# Build cxxopts module
ExternalProject_Add(cxxopts

+ 1
- 1
modules/antkeeper-source

@ -1 +1 @@
Subproject commit d027b2daf669fc02eece47f3832d63ac18fce1cd
Subproject commit d5bb5887cc1705a80042c1f9b3b11cb188e0c99c

+ 9
- 3
modules/glad/CMakeLists.txt View File

@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.7)
project(glad)
add_library(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/glad.c)
add_library(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/src/gl.c)
target_include_directories(${PROJECT_NAME} PRIVATE
${PROJECT_SOURCE_DIR}/include)
# Install library
install(TARGETS ${PROJECT_NAME}
@ -14,9 +17,12 @@ install(TARGETS ${PROJECT_NAME}
# Install headers
install(
FILES
${PROJECT_SOURCE_DIR}/glad.h
${PROJECT_SOURCE_DIR}/khrplatform.h
${PROJECT_SOURCE_DIR}/include/glad/gl.h
DESTINATION include/glad)
install(
FILES
${PROJECT_SOURCE_DIR}/include/KHR/khrplatform.h
DESTINATION include/KHR)
# Install CMake config file
install(EXPORT ${PROJECT_NAME}-targets

+ 0
- 1150
modules/glad/glad.c
File diff suppressed because it is too large
View File


+ 0
- 2147
modules/glad/glad.h
File diff suppressed because it is too large
View File


modules/glad/khrplatform.h → modules/glad/include/KHR/khrplatform.h View File


+ 3641
- 0
modules/glad/include/glad/gl.h
File diff suppressed because it is too large
View File


+ 1634
- 0
modules/glad/src/gl.c
File diff suppressed because it is too large
View File


Loading…
Cancel
Save