mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable only GLM_GTX_scalar_multiplication for C++11 compiler #242

Browse Source
This commit is contained in:
Christophe Riccio 2014-10-05 13:26:02 +02:00
parent 36af05b775
commit a00fc3fdf4
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glm/ext.hpp
View File

@ -117,8 +117,11 @@
#include "./gtx/raw_data.hpp"
#include "./gtx/rotate_vector.hpp"
#include "./gtx/spline.hpp"
#if GLM_LANG & GLM_LANG_CXX0X_FLAG
# include "./gtx/scalar_multiplication.hpp"
#endif
#include "./gtx/std_based_type.hpp"
#if(!(GLM_COMPILER & GLM_COMPILER_CUDA))
#if !(GLM_COMPILER & GLM_COMPILER_CUDA)
# include "./gtx/string_cast.hpp"
#endif
#include "./gtx/transform.hpp"
@ -128,7 +131,7 @@
#include "./gtx/vector_query.hpp"
#include "./gtx/wrap.hpp"
#if(GLM_ARCH & GLM_ARCH_SSE2)
#if GLM_ARCH & GLM_ARCH_SSE2
# include "./gtx/simd_vec4.hpp"
# include "./gtx/simd_mat4.hpp"
#endif

6
glm/gtx/scalar_multiplication.hpp
View File

@ -37,6 +37,12 @@
#pragma once
#include "../detail/setup.hpp"
#if !(GLM_LANG & GLM_LANG_CXX0X_FLAG)
# error "GLM_GTX_scalar_multiplication requires C++11 suppport"
#endif
#include "../vec2.hpp"
#include "../vec3.hpp"
#include "../vec4.hpp"

1
readme.txt
View File

@ -56,6 +56,7 @@ GLM 0.9.6.0: 2014-XX-XX
- Added vec3 slerp #237
- Added GTX_common with isdenomal #223
- Fixed implicit conversion from another tvec2 type to another tvec2 #241
- Added GTX_scalar_multiplication for C++ 11 compiler only #242
================================================================================
GLM 0.9.5.4: 2014-06-21

11
test/gtx/gtx_scalar_multiplication.cpp
View File

@ -10,6 +10,8 @@
#include <glm/glm.hpp>
#include <glm/gtx/scalar_multiplication.hpp>
#if GLM_LANG & GLM_LANG_CXX0X_FLAG
int main()
{
int Error(0);
@ -30,3 +32,12 @@ int main()
return Error;
}
#else
int main()
{
return 0;
}
#endif