organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-10 15:23:53 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fixed Visual C++ build

Browse source
This commit is contained in:
Christophe Riccio 2011-01-20 23:28:33 +00:00
parent a00f95d2b5
commit d8ddba592f
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
glm/setup.hpp
View file

@ -218,9 +218,9 @@
#if(defined(GLM_FORCE_CXX98))
# define GLM_LANG GLM_LANG_CXX98
#elif((GLM_COMPILER & GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) // -std=c++0x or -std=gnu++0x
#elif(((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) // -std=c++0x or -std=gnu++0x
# define GLM_LANG GLM_LANG_CXX0X
#elif GLM_COMPILER & GLM_COMPILER_VC2010 //_MSC_EXTENSIONS for MS language extensions
#elif(GLM_COMPILER == GLM_COMPILER_VC2010) //_MSC_EXTENSIONS for MS language extensions
# define GLM_LANG GLM_LANG_CXX0X
#else
# define GLM_LANG GLM_LANG_CXX98
@ -274,13 +274,13 @@
#endif
#if(GLM_ARCH != GLM_ARCH_PURE)
#if(GLM_ARCH & GLM_ARCH_AVX)
#if((GLM_ARCH & GLM_ARCH_AVX) == GLM_ARCH_AVX)
# include <immintrin.h>
#endif//GLM_ARCH
#if(GLM_ARCH & GLM_ARCH_SSE3)
#if((GLM_ARCH & GLM_ARCH_SSE3) == GLM_ARCH_SSE3)
# include <pmmintrin.h>
#endif//GLM_ARCH
#if(GLM_ARCH & GLM_ARCH_SSE2)
#if((GLM_ARCH & GLM_ARCH_SSE2) == GLM_ARCH_SSE2)
# include <emmintrin.h>
#endif//GLM_ARCH
#endif//(GLM_ARCH != GLM_ARCH_PURE)

2
test/gtx/gtx-simd-mat4.cpp
View file

@ -223,7 +223,7 @@ int test_compute_gtx()
int main(int argc, void* argv[])
{
int Failed = 0;
int Failed = GLM_COMPILER;
std::vector<glm::mat4> Data(1024 * 1024 * 8);
for(std::size_t i = 0; i < Data.size(); ++i)