mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up messages

Browse Source
This commit is contained in:
Christophe Riccio 2018-08-19 14:35:30 +02:00
parent 84797af694
commit f84216c735
3 changed files with 88 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glm/detail/glm.cpp
View File

@ -1,7 +1,6 @@
/// @ref core /// @ref core
/// @file glm/glm.cpp /// @file glm/glm.cpp
#define GLM_FORCE_MESSAGES
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/dual_quaternion.hpp> #include <glm/gtx/dual_quaternion.hpp>
#include <glm/gtc/vec1.hpp> #include <glm/gtc/vec1.hpp>

125
glm/detail/setup.hpp
View File

@ -857,48 +857,34 @@ namespace detail
# pragma message (GLM_VERSION_MESSAGE) # pragma message (GLM_VERSION_MESSAGE)
// Report C++ language // Report C++ language
# if GLM_LANG & GLM_LANG_CXX2A_FLAG # if (GLM_LANG & GLM_LANG_CXX2A_FLAG) && (GLM_LANG & GLM_LANG_EXT)
# if GLM_LANG & (GLM_LANG_CXXGNU_FLAG | GLM_LANG_CXXMS_FLAG)
# pragma message("GLM: C++ 2A with extensions") # pragma message("GLM: C++ 2A with extensions")
# else # elif (GLM_LANG & GLM_LANG_CXX2A_FLAG)
# pragma message("GLM: C++ 2A") # pragma message("GLM: C++ 2A")
# endif # elif (GLM_LANG & GLM_LANG_CXX17_FLAG) && (GLM_LANG & GLM_LANG_EXT)
# elif GLM_LANG & GLM_LANG_CXX17_FLAG
# if GLM_LANG & (GLM_LANG_CXXGNU_FLAG | GLM_LANG_CXXMS_FLAG)
# pragma message("GLM: C++ 17 with extensions") # pragma message("GLM: C++ 17 with extensions")
# else # elif (GLM_LANG & GLM_LANG_CXX17_FLAG)
# pragma message("GLM: C++ 17") # pragma message("GLM: C++ 17")
# endif # elif (GLM_LANG & GLM_LANG_CXX14_FLAG) && (GLM_LANG & GLM_LANG_EXT)
# elif GLM_LANG & GLM_LANG_CXX14_FLAG
# if GLM_LANG & (GLM_LANG_CXXGNU_FLAG | GLM_LANG_CXXMS_FLAG)
# pragma message("GLM: C++ 14 with extensions") # pragma message("GLM: C++ 14 with extensions")
# else # elif (GLM_LANG & GLM_LANG_CXX14_FLAG)
# pragma message("GLM: C++ 14") # pragma message("GLM: C++ 14")
# endif # elif (GLM_LANG & GLM_LANG_CXX11_FLAG) && (GLM_LANG & GLM_LANG_EXT)
# elif GLM_LANG & GLM_LANG_CXX11_FLAG
# if GLM_LANG & (GLM_LANG_CXXGNU_FLAG | GLM_LANG_CXXMS_FLAG)
# pragma message("GLM: C++ 11 with extensions") # pragma message("GLM: C++ 11 with extensions")
# else # elif (GLM_LANG & GLM_LANG_CXX11_FLAG)
# pragma message("GLM: C++ 11") # pragma message("GLM: C++ 11")
# endif # elif (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_LANG & GLM_LANG_EXT)
# elif GLM_LANG & GLM_LANG_CXX0X_FLAG
# if GLM_LANG & (GLM_LANG_CXXGNU_FLAG | GLM_LANG_CXXMS_FLAG)
# pragma message("GLM: C++ 0x with extensions") # pragma message("GLM: C++ 0x with extensions")
# else # elif (GLM_LANG & GLM_LANG_CXX0X_FLAG)
# pragma message("GLM: C++ 0x") # pragma message("GLM: C++ 0x")
# endif # elif (GLM_LANG & GLM_LANG_CXX03_FLAG) && (GLM_LANG & GLM_LANG_EXT)
# elif GLM_LANG & GLM_LANG_CXX03_FLAG
# if GLM_LANG & (GLM_LANG_CXXGNU_FLAG | GLM_LANG_CXXMS_FLAG)
# pragma message("GLM: C++ 03 with extensions") # pragma message("GLM: C++ 03 with extensions")
# else # elif (GLM_LANG & GLM_LANG_CXX03_FLAG)
# pragma message("GLM: C++ 03") # pragma message("GLM: C++ 03")
# endif # elif (GLM_LANG & GLM_LANG_CXX98_FLAG) && (GLM_LANG & GLM_LANG_EXT)
# elif GLM_LANG & GLM_LANG_CXX98_FLAG
# if GLM_LANG & (GLM_LANG_CXXGNU_FLAG | GLM_LANG_CXXMS_FLAG)
# pragma message("GLM: C++ 98 with extensions") # pragma message("GLM: C++ 98 with extensions")
# else # elif (GLM_LANG & GLM_LANG_CXX98_FLAG)
# pragma message("GLM: C++ 98") # pragma message("GLM: C++ 98")
# endif
# else # else
# pragma message("GLM: C++ language undetected") # pragma message("GLM: C++ language undetected")
# endif//GLM_LANG # endif//GLM_LANG
@ -919,78 +905,65 @@ namespace detail
# endif # endif
// Report build target // Report build target
# if GLM_ARCH & GLM_ARCH_AVX2_BIT # if (GLM_ARCH & GLM_ARCH_AVX2_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: x86 64 bits with AVX2 instruction set build target") # pragma message("GLM: x86 64 bits with AVX2 instruction set build target")
# else # elif (GLM_ARCH & GLM_ARCH_AVX2_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: x86 32 bits with AVX2 instruction set build target") # pragma message("GLM: x86 32 bits with AVX2 instruction set build target")
# endif
# elif GLM_ARCH & GLM_ARCH_AVX_BIT # elif (GLM_ARCH & GLM_ARCH_AVX_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: x86 64 bits with AVX instruction set build target") # pragma message("GLM: x86 64 bits with AVX instruction set build target")
# else # elif (GLM_ARCH & GLM_ARCH_AVX_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: x86 32 bits with AVX instruction set build target") # pragma message("GLM: x86 32 bits with AVX instruction set build target")
# endif
# elif GLM_ARCH & GLM_ARCH_SSE42_BIT # elif (GLM_ARCH & GLM_ARCH_SSE42_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: x86 64 bits with SSE4.2 instruction set build target") # pragma message("GLM: x86 64 bits with SSE4.2 instruction set build target")
# else # elif (GLM_ARCH & GLM_ARCH_SSE42_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: x86 32 bits with SSE4.2 instruction set build target") # pragma message("GLM: x86 32 bits with SSE4.2 instruction set build target")
# endif
# elif GLM_ARCH & GLM_ARCH_SSE41_BIT # elif (GLM_ARCH & GLM_ARCH_SSE41_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: x86 64 bits with SSE4.1 instruction set build target") # pragma message("GLM: x86 64 bits with SSE4.1 instruction set build target")
# else # elif (GLM_ARCH & GLM_ARCH_SSE41_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: x86 32 bits with SSE4.1 instruction set build target") # pragma message("GLM: x86 32 bits with SSE4.1 instruction set build target")
# endif
# elif GLM_ARCH & GLM_ARCH_SSSE3_BIT # elif (GLM_ARCH & GLM_ARCH_SSSE3_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: x86 64 bits with SSSE3 instruction set build target") # pragma message("GLM: x86 64 bits with SSSE3 instruction set build target")
# else # elif (GLM_ARCH & GLM_ARCH_SSSE3_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: x86 32 bits with SSSE3 instruction set build target") # pragma message("GLM: x86 32 bits with SSSE3 instruction set build target")
# endif
# elif GLM_ARCH & GLM_ARCH_SSE3_BIT # elif (GLM_ARCH & GLM_ARCH_SSE3_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: x86 64 bits with SSE3 instruction set build target") # pragma message("GLM: x86 64 bits with SSE3 instruction set build target")
# else # elif (GLM_ARCH & GLM_ARCH_SSE3_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: x86 32 bits with SSE3 instruction set build target") # pragma message("GLM: x86 32 bits with SSE3 instruction set build target")
# endif
# elif GLM_ARCH & GLM_ARCH_SSE2_BIT # elif (GLM_ARCH & GLM_ARCH_SSE2_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: x86 64 bits with SSE2 instruction set build target") # pragma message("GLM: x86 64 bits with SSE2 instruction set build target")
# else # elif (GLM_ARCH & GLM_ARCH_SSE2_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: x86 32 bits with SSE2 instruction set build target") # pragma message("GLM: x86 32 bits with SSE2 instruction set build target")
# endif
# elif GLM_ARCH & GLM_ARCH_X86_BIT # elif (GLM_ARCH & GLM_ARCH_X86_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: x86 64 bits build target") # pragma message("GLM: x86 64 bits build target")
# else # elif (GLM_ARCH & GLM_ARCH_X86_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: x86 32 bits build target") # pragma message("GLM: x86 32 bits build target")
# endif
# elif GLM_ARCH & GLM_ARCH_NEON_BIT # elif (GLM_ARCH & GLM_ARCH_NEON_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: ARM 64 bits with Neon instruction set build target") # pragma message("GLM: ARM 64 bits with Neon instruction set build target")
# else # elif (GLM_ARCH & GLM_ARCH_NEON_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: ARM 32 bits with Neon instruction set build target") # pragma message("GLM: ARM 32 bits with Neon instruction set build target")
# endif
# elif GLM_ARCH & GLM_ARCH_ARM_BIT # elif (GLM_ARCH & GLM_ARCH_ARM_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: ARM 64 bits build target") # pragma message("GLM: ARM 64 bits build target")
# else # elif (GLM_ARCH & GLM_ARCH_ARM_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: ARM 32 bits build target") # pragma message("GLM: ARM 32 bits build target")
# endif
# elif GLM_ARCH & GLM_ARCH_MIPS_BIT # elif (GLM_ARCH & GLM_ARCH_MIPS_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: MIPS 64 bits build target") # pragma message("GLM: MIPS 64 bits build target")
# else # elif (GLM_ARCH & GLM_ARCH_MIPS_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: MIPS 32 bits build target") # pragma message("GLM: MIPS 32 bits build target")
# endif
# elif GLM_ARCH & GLM_ARCH_PPC_BIT # elif (GLM_ARCH & GLM_ARCH_PPC_BIT) && (GLM_MODEL == GLM_MODEL_64)
# if GLM_MODEL == GLM_MODEL_64
# pragma message("GLM: PowerPC 64 bits build target") # pragma message("GLM: PowerPC 64 bits build target")
# else # elif (GLM_ARCH & GLM_ARCH_PPC_BIT) && (GLM_MODEL == GLM_MODEL_32)
# pragma message("GLM: PowerPC 32 bits build target") # pragma message("GLM: PowerPC 32 bits build target")
# endif
# else # else
# pragma message("GLM: Unknown build target") # pragma message("GLM: Unknown build target")
# endif//GLM_ARCH # endif//GLM_ARCH

1
test/core/core_setup_message.cpp
View File

@ -1,3 +1,4 @@
#define GLM_FORCE_MESSAGES
#include <glm/vec3.hpp> #include <glm/vec3.hpp>
#include <cstdio> #include <cstdio>