diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-08-04 15:42:08 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-26 14:20:13 +0100 |
| commit | 58d199db480358aa88a427245f4f4716447fa3f3 (patch) | |
| tree | 04523c18a458013ee79b2ee40320b130814b6db7 /dep | |
| parent | e2fb15fd225e772a43cac3e5df19fd94d3557997 (diff) | |
Core/Misc: Fix compile errors found with msvc /permissive-
(cherry picked from commit b3db50a3b41b2db209327387f59afa1c40532773)
Diffstat (limited to 'dep')
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix13.diff | 25 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/g3dmath.h | 1 | ||||
| -rw-r--r-- | dep/g3dlite/source/debugAssert.cpp | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix13.diff b/dep/g3dlite/G3D-v9.0 hotfix13.diff new file mode 100644 index 00000000000..b02e2242be4 --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix13.diff @@ -0,0 +1,25 @@ +diff --git a/dep/g3dlite/include/G3D/g3dmath.h b/dep/g3dlite/include/G3D/g3dmath.h +index 54cc6ed370..002cd3858d 100644 +--- a/dep/g3dlite/include/G3D/g3dmath.h ++++ b/dep/g3dlite/include/G3D/g3dmath.h +@@ -27,6 +27,7 @@ + #include "G3D/platform.h" + #include <ctype.h> + #include <float.h> ++#include <algorithm> + #include <limits> + #include <stdlib.h> + #include <stdint.h> +diff --git a/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp +index cfccf9a0cc..3c3e43a0af 100644 +--- a/dep/g3dlite/source/debugAssert.cpp ++++ b/dep/g3dlite/source/debugAssert.cpp +@@ -99,7 +99,7 @@ static void createErrorMessage( + } + + // Make sure the message got translated into something. +- LPTSTR realLastErr; ++ LPCTSTR realLastErr; + if (NULL != formatMsg) { + realLastErr = formatMsg; + } else { diff --git a/dep/g3dlite/include/G3D/g3dmath.h b/dep/g3dlite/include/G3D/g3dmath.h index 54cc6ed3704..002cd3858d8 100644 --- a/dep/g3dlite/include/G3D/g3dmath.h +++ b/dep/g3dlite/include/G3D/g3dmath.h @@ -27,6 +27,7 @@ #include "G3D/platform.h" #include <ctype.h> #include <float.h> +#include <algorithm> #include <limits> #include <stdlib.h> #include <stdint.h> diff --git a/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp index cfccf9a0cc5..3c3e43a0af9 100644 --- a/dep/g3dlite/source/debugAssert.cpp +++ b/dep/g3dlite/source/debugAssert.cpp @@ -99,7 +99,7 @@ static void createErrorMessage( } // Make sure the message got translated into something. - LPTSTR realLastErr; + LPCTSTR realLastErr; if (NULL != formatMsg) { realLastErr = formatMsg; } else { |