32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
--- a/CMakeLists.txt 2021-11-11 14:06:11.239318455 +0300
|
|
+++ b/CMakeLists.txt 2021-06-03 12:33:06.815782932 +0300
|
|
@@ -259,7 +259,7 @@
|
|
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
|
|
|
|
install(FILES
|
|
- "${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake"
|
|
+ "${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake"
|
|
DESTINATION ${GLM_INSTALL_CONFIGDIR})
|
|
|
|
--- a/glm/detail/setup.hpp 2021-11-11 14:06:11.235318377 +0300
|
|
+++ b/glm/detail/setup.hpp 2021-08-24 14:19:30.684324452 +0300
|
|
@@ -35,7 +35,7 @@
|
|
///////////////////////////////////////////////////////////////////////////////////
|
|
// Build model
|
|
|
|
-#if defined(__arch64__) || defined(__LP64__) || defined(_M_X64) || defined(__ppc64__) || defined(__x86_64__)
|
|
+#if defined(__arch64__) || defined(__LP64__) || defined(_M_X64) || defined(__ppc64__) || defined(__x86_64__) || defined(__e2k__)
|
|
# define GLM_MODEL GLM_MODEL_64
|
|
#elif defined(__i386__) || defined(__ppc__)
|
|
# define GLM_MODEL GLM_MODEL_32
|
|
@@ -265,7 +265,7 @@
|
|
#if GLM_COMPILER & GLM_COMPILER_CLANG
|
|
# define GLM_HAS_ALIGNOF __has_feature(cxx_alignas)
|
|
#elif GLM_LANG & GLM_LANG_CXX11_FLAG
|
|
-# define GLM_HAS_ALIGNOF 1
|
|
+# define GLM_HAS_ALIGNOF 0
|
|
#else
|
|
# define GLM_HAS_ALIGNOF ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
|
|
((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL15)) || \
|