merge 0.9.7
This commit is contained in:
@@ -575,7 +575,7 @@
|
||||
# define GLM_MSC_EXT GLM_LANG_CXXMS_FLAG
|
||||
# else
|
||||
# define GLM_MSC_EXT 0
|
||||
# endif
|
||||
# endif
|
||||
# if __cplusplus >= 201402L
|
||||
# define GLM_LANG (GLM_LANG_CXX14 | GLM_MSC_EXT)
|
||||
# elif __cplusplus >= 201103L
|
||||
|
||||
@@ -43,8 +43,12 @@
|
||||
#pragma once
|
||||
|
||||
// Dependency:
|
||||
#include <cfloat>
|
||||
#include <limits>
|
||||
#include "../glm.hpp"
|
||||
#include "../geometric.hpp"
|
||||
#include "../gtx/closest_point.hpp"
|
||||
#include "../gtx/vector_query.hpp"
|
||||
|
||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
||||
# pragma message("GLM: GLM_GTX_closest_point extension included")
|
||||
|
||||
@@ -7,10 +7,6 @@
|
||||
// File : glm/gtx/intersect.inl
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "../geometric.hpp"
|
||||
#include <cfloat>
|
||||
#include <limits>
|
||||
|
||||
namespace glm
|
||||
{
|
||||
template <typename genType>
|
||||
|
||||
Reference in New Issue
Block a user