Switching from GLEW to GLAD, WIP refactoring math library to separate built library, 'hydra'.

This commit is contained in:
2018-04-22 23:27:20 -07:00
parent ac479080ea
commit d31a9b0538
7 changed files with 297 additions and 261 deletions

9
.gitmodules vendored Normal file
View File

@@ -0,0 +1,9 @@
[submodule "3rdparty/glfw"]
path = 3rdparty/glfw
url = git@github.com:glfw/glfw.git
[submodule "3rdparty/glad"]
path = 3rdparty/glad
url = git@github.com:Dav1dde/glad.git
[submodule "hydra"]
path = hydra
url = git@github.com:KrakenEngine/hydra.git

1
3rdparty/glad vendored Submodule

Submodule 3rdparty/glad added at 5831fb7741

1
3rdparty/glfw vendored Submodule

Submodule 3rdparty/glfw added at 23dfeee4cb

View File

@@ -84,6 +84,30 @@ if(Boost_FOUND)
target_link_libraries(kraken ${Boost_LIBRARIES}) target_link_libraries(kraken ${Boost_LIBRARIES})
endif() endif()
# ---- Hydra ----
add_subdirectory(hydra)
include_directories(hydra/include)
target_link_libraries(kraken hydra)
# ---- OpenGL ----
find_package(OpenGL REQUIRED)
include_directories( ${OPENGL_INCLUDE_DIRS} )
target_link_libraries(kraken ${OPENGL_LIBRARIES})
# ---- GLAD ----
add_subdirectory(3rdparty/glad)
include_directories(${GLAD_INCLUDE_DIRS})
target_link_libraries(kraken glad)
# ---- GLFW ----
set(GLFW_BUILD_EXAMPLES OFF CACHE INTERNAL "Build the GLFW example programs")
set(GLFW_BUILD_TESTS OFF CACHE INTERNAL "Build the GLFW test programs")
set(GLFW_BUILD_DOCS OFF CACHE INTERNAL "Build the GLFW documentation")
set(GLFW_INSTALL OFF CACHE INTERNAL "Generate installation target")
add_subdirectory(3rdparty/glfw)
include_directories(3rdparty/glfw/include)
target_link_libraries(kraken glfw ${GLFW_LIBRARIES})
# add_custom_target(package # add_custom_target(package
# COMMENT "Compressing..." # COMMENT "Compressing..."
# WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/archive" # WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/archive"

1
hydra Submodule

Submodule hydra added at 00bb9b6689

View File

@@ -114,7 +114,7 @@ typedef uint16_t __uint16_t;
typedef int8_t __int8_t; typedef int8_t __int8_t;
typedef uint8_t __uint8_t; typedef uint8_t __uint8_t;
#include <GL/glew.h> #include <glad/glad.h>
// OpenGL ES 2.0 mapping to OpenGL 3.2 // OpenGL ES 2.0 mapping to OpenGL 3.2
#define glDeleteQueriesEXT glDeleteQueries #define glDeleteQueriesEXT glDeleteQueries
#define glGenQueriesEXT glGenQueries #define glGenQueriesEXT glGenQueries

View File

@@ -2,7 +2,7 @@
#define KRHELPERS_H #define KRHELPERS_H
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <GL/glew.h> #include <glad/glad.h>
#elif defined(__linux__) || defined(__unix__) || defined(__posix__) #elif defined(__linux__) || defined(__unix__) || defined(__posix__)
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>