mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed conflict

Browse Source
This commit is contained in:
Christophe Riccio
2013-02-20 15:46:10 +01:00
parent d8aba7302d
commit af77fb3118
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/setup.hpp
View File

@@ -667,6 +667,8 @@
# define GLM_INLINE __forceinline # define GLM_INLINE __forceinline
# elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC34)) # elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC34))
# define GLM_INLINE __attribute__((always_inline)) # define GLM_INLINE __attribute__((always_inline))
# elif(GLM_COMPILER & GLM_COMPILER_CLANG)
# define GLM_INLINE __attribute__((always_inline))
# else # else
# define GLM_INLINE inline # define GLM_INLINE inline
# endif//GLM_COMPILER # endif//GLM_COMPILER