]>
Commit | Line | Data |
---|---|---|
6a66edba JB |
1 | --- glm-1.0.1/test/core/core_setup_message.cpp.orig 2024-02-27 18:19:47.000000000 +0100 |
2 | +++ glm-1.0.1/test/core/core_setup_message.cpp 2024-04-29 17:54:10.823524118 +0200 | |
3 | @@ -223,8 +223,14 @@ static int test_compiler() | |
4 | static int test_model() | |
344ac6d5 JP |
5 | { |
6 | int Error = 0; | |
6a66edba | 7 | - |
344ac6d5 | 8 | - Error += ((sizeof(void*) == 4) && (GLM_MODEL == GLM_MODEL_32)) || ((sizeof(void*) == 8) && (GLM_MODEL == GLM_MODEL_64)) ? 0 : 1; |
6a66edba JB |
9 | + |
10 | + bool supported64 = | |
11 | +#if defined(__x86_64__) && defined(__ILP32__) | |
12 | + true; | |
13 | +#else | |
14 | + (sizeof(void*) == 8); | |
344ac6d5 | 15 | +#endif |
6a66edba | 16 | + Error += ((sizeof(void*) == 4) && (GLM_MODEL == GLM_MODEL_32)) || (supported64 && (GLM_MODEL == GLM_MODEL_64)) ? 0 : 1; |
344ac6d5 | 17 | |
6a66edba | 18 | # if GLM_MODEL == GLM_MODEL_32 |
344ac6d5 | 19 | std::printf("GLM_MODEL_32\n"); |
6a66edba JB |
20 | --- glm-1.0.1/glm/gtx/string_cast.inl.orig 2024-02-27 18:19:47.000000000 +0100 |
21 | +++ glm-1.0.1/glm/gtx/string_cast.inl 2024-04-29 17:54:31.413345096 +0200 | |
22 | @@ -58,7 +58,6 @@ namespace detail | |
23 | GLM_FUNC_QUALIFIER static char const * value() {return "%f";} | |
24 | }; | |
25 | ||
26 | -# if GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC | |
27 | template<> | |
28 | struct literal<uint64_t, false> | |
29 | { | |
30 | @@ -70,7 +69,6 @@ namespace detail | |
31 | { | |
32 | GLM_FUNC_QUALIFIER static char const * value() {return "%lld";} | |
33 | }; | |
34 | -# endif//GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC | |
35 | ||
36 | template<typename T> | |
37 | struct prefix{}; |