From 9a625f4d5b28b507cb51de0b855bc43f806c69c9 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 7 Jan 2013 23:37:59 +0000 Subject: [PATCH] Fixed SIMD support for Intel compiler on Windows, issue #32 --- glm/core/_detail.hpp | 7 +++++++ readme.txt | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index ecc9250e..ad8f19e3 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -445,6 +445,13 @@ namespace detail # define GLM_RESTRICT __declspec(restrict) # define GLM_RESTRICT_VAR __restrict # define GLM_CONSTEXPR +#elif(GLM_COMPILER & GLM_COMPILER_INTEL) +# define GLM_DEPRECATED +# define GLM_ALIGN(x) __declspec(align(x)) +# define GLM_ALIGNED_STRUCT(x) __declspec(align(x)) struct +# define GLM_RESTRICT +# define GLM_RESTRICT_VAR __restrict +# define GLM_CONSTEXPR #elif((GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_LLVM_GCC)) && (GLM_COMPILER >= GLM_COMPILER_GCC31)) # define GLM_DEPRECATED __attribute__((__deprecated__)) # define GLM_ALIGN(x) __attribute__((aligned(x))) diff --git a/readme.txt b/readme.txt index 5b48f4ca..b3fd8326 100644 --- a/readme.txt +++ b/readme.txt @@ -7,7 +7,7 @@ glm@g-truc.net ================================================================================ The MIT License -------------------------------------------------------------------------------- -Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net) +Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -36,6 +36,11 @@ GLM is a header only library, there is nothing to build, just include it. More informations in GLM manual: http://glm.g-truc.net/glm.pdf +================================================================================ +GLM 0.9.4.2: 2013-01-XX +-------------------------------------------------------------------------------- +- Fixed SIMD support for Intel compiler on Windows + ================================================================================ GLM 0.9.4.1: 2012-12-22 --------------------------------------------------------------------------------