TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix merge conflict and add check for unix and not apple for glx

Browse source 
Merge branch 'development-gg' into gladdev

# Conflicts:
#	Tools/CMake/libraries/glad.cmake
This commit is contained in:
Jeff Hutchinson 2016-11-02 21:55:24 -04:00
commit 0296e6d3fd
728 changed files with 83679 additions and 66879 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tools/CMake/libraries/glad.cmake
View file

@ -27,7 +27,7 @@ addPath("${libDir}/glad/src")
# TODO EGL support if we ever use EGL instead of GLX
if (WIN32)
addPath("${libDir}/glad/src/wgl")
else()
elseif (UNIX AND NOT APPLE)
addPath("${libDir}/glad/src/glx")
endif()

15
Tools/CMake/libraries/libogg.cmake
View file

@ -22,6 +22,21 @@
project(libogg)
include(CheckIncludeFiles)
# Configure config_type.h
check_include_files(inttypes.h INCLUDE_INTTYPES_H)
check_include_files(stdint.h INCLUDE_STDINT_H)
check_include_files(sys/types.h INCLUDE_SYS_TYPES_H)
set(SIZE16 int16_t)
set(USIZE16 uint16_t)
set(SIZE32 int32_t)
set(USIZE32 uint32_t)
set(SIZE64 int64_t)
configure_file(${libDir}/libogg/include/ogg/config_types.h.in ${libDir}/libogg/include/ogg/config_types.h @ONLY)
addPath("${libDir}/libogg" REC)
addInclude(${libDir}/libogg/include)