mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 09:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler detection between GCC, LLVM and Clang; fixed MinGW build

Browse Source
This commit is contained in:
Christophe Riccio 2011-06-01 16:09:20 +01:00
parent 5375fbbc97
commit 54e8df2ff3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glm/core/intrinsic_common.inl
View File

@ -205,10 +205,10 @@ GLM_FUNC_QUALIFIER __m128 sse_mod_ps(__m128 x, __m128 y)
} }
/// TODO /// TODO
GLM_FUNC_QUALIFIER __m128 sse_modf_ps(__m128 x, __m128i & i) //GLM_FUNC_QUALIFIER __m128 sse_modf_ps(__m128 x, __m128i & i)
{ //{
return __m128(); // return __m128();
} //}
//GLM_FUNC_QUALIFIER __m128 _mm_min_ps(__m128 x, __m128 y) //GLM_FUNC_QUALIFIER __m128 _mm_min_ps(__m128 x, __m128 y)

8
glm/core/setup.hpp
View File

@ -43,8 +43,8 @@
// GCC defines // GCC defines
#define GLM_COMPILER_GCC 0x02000000 #define GLM_COMPILER_GCC 0x02000000
#define GLM_COMPILER_GCC_LLVM 0x02000000 #define GLM_COMPILER_GCC_LLVM 0x02000001
#define GLM_COMPILER_GCC_CLANG 0x02000000 #define GLM_COMPILER_GCC_CLANG 0x02000002
#define GLM_COMPILER_GCC30 0x02000010 #define GLM_COMPILER_GCC30 0x02000010
#define GLM_COMPILER_GCC31 0x02000020 #define GLM_COMPILER_GCC31 0x02000020
#define GLM_COMPILER_GCC32 0x02000030 #define GLM_COMPILER_GCC32 0x02000030
@ -214,9 +214,9 @@
# elif(GLM_COMPILER & GLM_COMPILER_LLVM_GCC) # elif(GLM_COMPILER & GLM_COMPILER_LLVM_GCC)
# pragma message("GLM: LLVM GCC compiler detected") # pragma message("GLM: LLVM GCC compiler detected")
# elif(GLM_COMPILER & GLM_COMPILER_GCC) # elif(GLM_COMPILER & GLM_COMPILER_GCC)
# if(GLM_COMPILER & GLM_COMPILER_GCC_LLVM) # if(GLM_COMPILER == GLM_COMPILER_GCC_LLVM)
# pragma message("GLM: LLVM GCC compiler detected") # pragma message("GLM: LLVM GCC compiler detected")
# elif(GLM_COMPILER & GLM_COMPILER_GCC_CLANG) # elif(GLM_COMPILER == GLM_COMPILER_GCC_CLANG)
# pragma message("GLM: CLANG compiler detected") # pragma message("GLM: CLANG compiler detected")
# else # else
# pragma message("GLM: GCC compiler detected") # pragma message("GLM: GCC compiler detected")