Correct g3d patch naming conflicts with master branch

4 files changed, 43 insertions, 36 deletions

diff --git a/dep/g3dlite/G3D-v9.0 hotfix10.diff b/dep/g3dlite/G3D-v9.0 hotfix10.diff
deleted file mode 100644
index b02e2242be4..00000000000
--- a/dep/g3dlite/G3D-v9.0 hotfix10.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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/G3D-v9.0 hotfix13.diff b/dep/g3dlite/G3D-v9.0 hotfix13.diff
index a2127a2907c..b02e2242be4 100644
--- a/dep/g3dlite/G3D-v9.0 hotfix13.diff
+++ b/dep/g3dlite/G3D-v9.0 hotfix13.diff
@@ -1,12 +1,25 @@
-diff --git a/dep/g3dlite/include/G3D/Vector3.h b/dep/g3dlite/include/G3D/Vector3.h
-index 1c42513b45..05d9b11ed5 100644
---- a/dep/g3dlite/include/G3D/Vector3.h
-+++ b/dep/g3dlite/include/G3D/Vector3.h
-@@ -128,7 +128,6 @@ public:
-     Axis primaryAxis() const;
+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(
+         }
  
-     // assignment and comparison
--    Vector3& operator=(const Vector3& rkVector) = default;
-     Vector3& operator=(const Any& a);
-     bool operator== (const Vector3& rkVector) const;
-     bool operator!= (const Vector3& rkVector) const;
+         // Make sure the message got translated into something.
+-        LPTSTR realLastErr;
++        LPCTSTR realLastErr;
+         if (NULL != formatMsg) {
+             realLastErr = formatMsg;
+         } else {
diff --git a/dep/g3dlite/G3D-v9.0 hotfix14.diff b/dep/g3dlite/G3D-v9.0 hotfix14.diff
new file mode 100644
index 00000000000..a2127a2907c
--- /dev/null
+++ b/dep/g3dlite/G3D-v9.0 hotfix14.diff
@@ -0,0 +1,12 @@
+diff --git a/dep/g3dlite/include/G3D/Vector3.h b/dep/g3dlite/include/G3D/Vector3.h
+index 1c42513b45..05d9b11ed5 100644
+--- a/dep/g3dlite/include/G3D/Vector3.h
++++ b/dep/g3dlite/include/G3D/Vector3.h
+@@ -128,7 +128,6 @@ public:
+     Axis primaryAxis() const;
+ 
+     // assignment and comparison
+-    Vector3& operator=(const Vector3& rkVector) = default;
+     Vector3& operator=(const Any& a);
+     bool operator== (const Vector3& rkVector) const;
+     bool operator!= (const Vector3& rkVector) const;
diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt
index e94dbaabd7e..95cf9c186c6 100644
--- a/dep/g3dlite/Readme.txt
+++ b/dep/g3dlite/Readme.txt
@@ -17,3 +17,10 @@ G3D-v9.0 hotfix4.diff - 2015-07-02 - backport G3D10 fix
 G3D-v9.0 hotfix5.diff - 2015-07-31 - fix MSVC 2015 warning: dep/g3dlite/include/G3D/Quat.h(352): warning C4458: declaration of 'x' hides class member
 G3D-v9.0 hotfix6.diff - 2015-11-04 - fix adding std::shared_ptr, std::weak_ptr, std::dynamic_pointer_cast, std::static_pointer_cast and std::enable_shared_from_this to global namespace
 G3D-v9.0 hotfix7.diff - 2016-10-10 - fix warning on clang 3.8 backported from G3D 10
+G3D-v9.0 hotfix8.diff - 2017-03-07 - fix MSVC 2017 build
+G3D-v9.0 hotfix9.diff - 2020-07-13 - warning fixes
+G3D-v9.0 hotfix10.diff - 2017-11-11 - static analysis issue fix
+G3D-v9.0 hotfix11.diff - 2017-11-11 - static analysis issue fix
+G3D-v9.0 hotfix12.diff - 2020-02-23 - ARM64 build fix
+G3D-v9.0 hotfix13.diff - 2020-08-04 - MSVC build fix with /permissive-
+G3D-v9.0 hotfix14.diff - 2022-01-16 - warning fixes