mewin/glm
1
0
Fork 0
Code Releases Activity

Deleted VIRTREV_xstream

Browse Source
This commit is contained in:
Christophe Riccio 2012-06-28 17:01:02 +01:00
parent 6eeec5c191
commit e26b0587b2
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -14,11 +14,9 @@ endif()
option(GLM_TEST_ENABLE_CXX_11 "Enable C++ 11" OFF) option(GLM_TEST_ENABLE_CXX_11 "Enable C++ 11" OFF)
if(GLM_TEST_ENABLE_CXX_11) if(GLM_TEST_ENABLE_CXX_11)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-std=c++11) add_definitions(-std=c++0x)
endif() endif()
elseif(NOT GLM_TEST_ENABLE_CXX_11) elseif(NOT GLM_TEST_ENABLE_CXX_11)
add_definitions(-DGLM_FORCE_CXX98)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-std=c++98) add_definitions(-std=c++98)
endif() endif()
@ -27,8 +25,9 @@ endif()
option(GLM_TEST_ENABLE_MS_EXTENSIONS "Enable MS extensions" OFF) option(GLM_TEST_ENABLE_MS_EXTENSIONS "Enable MS extensions" OFF)
if(GLM_TEST_ENABLE_MS_EXTENSIONS) if(GLM_TEST_ENABLE_MS_EXTENSIONS)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-fms-extensions) #Doesn't seem to work...
add_definitions(-D_MSC_EXTENSIONS) #add_definitions(-fms-extensions)
#add_definitions(-D_MSC_EXTENSIONS)
endif() endif()
elseif(NOT GLM_TEST_ENABLE_MS_EXTENSIONS) elseif(NOT GLM_TEST_ENABLE_MS_EXTENSIONS)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)

7
glm/core/setup.hpp
View File

@ -430,6 +430,8 @@
# define GLM_LANG GLM_LANG_CXX0X # define GLM_LANG GLM_LANG_CXX0X
# elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && defined(_MSC_EXTENSIONS)) # elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && defined(_MSC_EXTENSIONS))
# define GLM_LANG GLM_LANG_CXXMS # define GLM_LANG GLM_LANG_CXXMS
# elif(((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) && defined(_MSC_EXTENSIONS))
# define GLM_LANG GLM_LANG_CXXMS
# elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && !defined(_MSC_EXTENSIONS)) # elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && !defined(_MSC_EXTENSIONS))
# if(GLM_COMPILER >= GLM_COMPILER_VC2010) # if(GLM_COMPILER >= GLM_COMPILER_VC2010)
# define GLM_LANG GLM_LANG_CXX0X # define GLM_LANG GLM_LANG_CXX0X
@ -563,8 +565,11 @@
#define GLM_SUPPORT_ANONYMOUS_UNION() \ #define GLM_SUPPORT_ANONYMOUS_UNION() \
((GLM_LANG & GLM_LANG_CXX98) == GLM_LANG_CXX98) ((GLM_LANG & GLM_LANG_CXX98) == GLM_LANG_CXX98)
//#define GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE() \
// (((GLM_LANG & GLM_LANG_CXX11) == GLM_LANG_CXX11) || ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_LANG & GLM_LANG_CXXMS) == GLM_LANG_CXXMS) || ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_LANG == GLM_LANG_CXX0X)))
#define GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE() \ #define GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE() \
(((GLM_LANG & GLM_LANG_CXX11) == GLM_LANG_CXX11) || ((GLM_LANG & GLM_LANG_CXXMS) == GLM_LANG_CXXMS) || ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_LANG == GLM_LANG_CXX0X))) (((GLM_LANG & GLM_LANG_CXX11) == GLM_LANG_CXX11) || ((GLM_COMPILER & GLM_COMPILER_VC) && ((GLM_LANG & GLM_LANG_CXXMS) == GLM_LANG_CXXMS)) || ((GLM_LANG == GLM_LANG_CXX0X) == GLM_LANG_CXX0X))
#define GLM_SUPPORT_SWIZZLE_OPERATOR() \ #define GLM_SUPPORT_SWIZZLE_OPERATOR() \
(/*defined(GLM_SWIZZLE) && */GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE()) (/*defined(GLM_SWIZZLE) && */GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())

3
glm/core/type_vec3.hpp
View File

@ -84,12 +84,13 @@ namespace detail
union {value_type x, r, s;}; union {value_type x, r, s;};
union {value_type y, g, t;}; union {value_type y, g, t;};
union {value_type z, b, p;}; union {value_type z, b, p;};
/*
# if(defined(GLM_SWIZZLE)) # if(defined(GLM_SWIZZLE))
// Defines all he swizzle operator as functions // Defines all he swizzle operator as functions
GLM_SWIZZLE_GEN_REF_FROM_VEC3(T, detail::tvec3, detail::tref2, detail::tref3) GLM_SWIZZLE_GEN_REF_FROM_VEC3(T, detail::tvec3, detail::tref2, detail::tref3)
GLM_SWIZZLE_GEN_VEC_FROM_VEC3(T, detail::tvec3, detail::tvec2, detail::tvec3, detail::tvec4) GLM_SWIZZLE_GEN_VEC_FROM_VEC3(T, detail::tvec3, detail::tvec2, detail::tvec3, detail::tvec4)
# endif//(defined(GLM_SWIZZLE)) # endif//(defined(GLM_SWIZZLE))
*/
# else //(GLM_COMPONENT == GLM_COMPONENT_ONLY_XYZW) # else //(GLM_COMPONENT == GLM_COMPONENT_ONLY_XYZW)
value_type x, y, z; value_type x, y, z;

4
glm/gtc/half_float.hpp
View File

@ -47,7 +47,7 @@
namespace glm{ namespace glm{
namespace detail namespace detail
{ {
#if(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE()) #if(GLM_COMPONENT == GLM_COMPONENT_CXX98)
template <> template <>
struct tvec2<half> struct tvec2<half>
{ {
@ -345,7 +345,7 @@ namespace detail
tvec4<half> swizzle(comp X, comp Y, comp Z, comp W) const; tvec4<half> swizzle(comp X, comp Y, comp Z, comp W) const;
tref4<half> swizzle(comp X, comp Y, comp Z, comp W); tref4<half> swizzle(comp X, comp Y, comp Z, comp W);
}; };
#endif//(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE()) #endif//(GLM_COMPONENT == GLM_COMPONENT_CXX98)
} }
//namespace detail //namespace detail

4
glm/gtc/half_float.inl
View File

@ -29,7 +29,7 @@
namespace glm{ namespace glm{
namespace detail namespace detail
{ {
#if(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE()) #if(GLM_COMPONENT == GLM_COMPONENT_CXX98)
////////////////////////////////////// //////////////////////////////////////
// hvec2 // hvec2
@ -1003,7 +1003,7 @@ namespace detail
(*this)[w]); (*this)[w]);
} }
#endif//(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE()) #endif//(GLM_COMPONENT == GLM_COMPONENT_CXX98)
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm

4
glm/virtrev/xstream.hpp
View File

@ -46,7 +46,7 @@
#if(defined(GLM_MESSAGES) && !defined(glm_ext)) #if(defined(GLM_MESSAGES) && !defined(glm_ext))
# pragma message("GLM: GLM_VIRTREV_xstream extension included") # pragma message("GLM: GLM_VIRTREV_xstream extension included")
#endif #endif
/*
namespace glm{ namespace glm{
namespace detail namespace detail
{ {
@ -162,5 +162,5 @@ namespace detail
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm
*/
#endif//GLM_VIRTREV_xstream #endif//GLM_VIRTREV_xstream