From faa262b73cb3bc92b745b70e537128c327bb6050 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Sun, 11 Oct 2015 18:41:28 -1000
Subject: [PATCH] Windows fixes

---
 DataSpec/DNACommon/BabeDead.hpp |  5 +++++
 DataSpec/DNAMP1/MREA.cpp        |  6 ++++--
 DataSpec/DNAMP2/MREA.cpp        |  4 ++--
 DataSpec/DNAMP3/MREA.cpp        | 10 +++++-----
 DataSpec/SpecMP1.cpp            |  2 +-
 DataSpec/SpecMP2.cpp            |  2 +-
 DataSpec/SpecMP3.cpp            |  2 +-
 MathLib                         |  2 +-
 Runtime/MP1/main.cpp            |  3 +++
 hecl                            |  2 +-
 10 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/DataSpec/DNACommon/BabeDead.hpp b/DataSpec/DNACommon/BabeDead.hpp
index 77f3b7742..6b05002a4 100644
--- a/DataSpec/DNACommon/BabeDead.hpp
+++ b/DataSpec/DNACommon/BabeDead.hpp
@@ -3,6 +3,11 @@
 
 #include <BlenderConnection.hpp>
 
+#ifndef _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES 1
+#endif
+#include <math.h>
+
 namespace Retro
 {
 
diff --git a/DataSpec/DNAMP1/MREA.cpp b/DataSpec/DNAMP1/MREA.cpp
index 8077dc5c5..8865007cb 100644
--- a/DataSpec/DNAMP1/MREA.cpp
+++ b/DataSpec/DNAMP1/MREA.cpp
@@ -3,7 +3,9 @@
 #include "DeafBabe.hpp"
 #include "../DNACommon/BabeDead.hpp"
 
-#define _USE_MATH_DEFINES
+#ifndef _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES 1
+#endif
 #include <math.h>
 
 namespace Retro
@@ -92,7 +94,7 @@ bool MREA::Extract(const SpecBase& dataSpec,
 
     /* Read meshes */
     atUint32 curSec = 1;
-    for (int m=0 ; m<head.meshCount ; ++m)
+    for (atUint32 m=0 ; m<head.meshCount ; ++m)
     {
         MeshHeader mHeader;
         secStart = rs.position();
diff --git a/DataSpec/DNAMP2/MREA.cpp b/DataSpec/DNAMP2/MREA.cpp
index 3b35600df..6445e9431 100644
--- a/DataSpec/DNAMP2/MREA.cpp
+++ b/DataSpec/DNAMP2/MREA.cpp
@@ -73,7 +73,7 @@ MREA::StreamReader::StreamReader(Athena::io::IStreamReader& source, atUint32 blk
   m_source(source), m_blkCount(blkCount)
 {
     m_blockInfos.reserve(blkCount);
-    for (int i=0 ; i<blkCount ; ++i)
+    for (atUint32 i=0 ; i<blkCount ; ++i)
     {
         m_blockInfos.emplace_back();
         BlockInfo& info = m_blockInfos.back();
@@ -228,7 +228,7 @@ bool MREA::Extract(const SpecBase& dataSpec,
 
     /* Read meshes */
     atUint32 curSec = 1;
-    for (int m=0 ; m<head.meshCount ; ++m)
+    for (atUint32 m=0 ; m<head.meshCount ; ++m)
     {
         MeshHeader mHeader;
         secStart = drs.position();
diff --git a/DataSpec/DNAMP3/MREA.cpp b/DataSpec/DNAMP3/MREA.cpp
index 9a4b91163..86704348b 100644
--- a/DataSpec/DNAMP3/MREA.cpp
+++ b/DataSpec/DNAMP3/MREA.cpp
@@ -14,7 +14,7 @@ MREA::StreamReader::StreamReader(Athena::io::IStreamReader& source,
 {
     m_blkCount = blkCount;
     m_blockInfos.reserve(blkCount);
-    for (int i=0 ; i<blkCount ; ++i)
+    for (atUint32 i=0 ; i<blkCount ; ++i)
     {
         m_blockInfos.emplace_back();
         BlockInfo& info = m_blockInfos.back();
@@ -23,7 +23,7 @@ MREA::StreamReader::StreamReader(Athena::io::IStreamReader& source,
     }
     source.seekAlign32();
     m_secIdxs.reserve(secIdxCount);
-    for (int i=0 ; i<secIdxCount ; ++i)
+    for (atUint32 i=0 ; i<secIdxCount ; ++i)
     {
         m_secIdxs.emplace_back();
         std::pair<DNAFourCC, atUint32>& idx = m_secIdxs.back();
@@ -136,7 +136,7 @@ bool MREA::Extract(const SpecBase& dataSpec,
     atUint32 curSec = 1;
     std::vector<atUint32> surfaceCounts;
     surfaceCounts.reserve(head.meshCount);
-    for (int m=0 ; m<head.meshCount ; ++m)
+    for (atUint32 m=0 ; m<head.meshCount ; ++m)
     {
         /* Mesh header */
         MeshHeader mHeader;
@@ -176,7 +176,7 @@ bool MREA::Extract(const SpecBase& dataSpec,
     /* Now the meshes themselves */
     if (secIdxIt->first == FOURCC('GPUD'))
     {
-        for (int m=0 ; m<head.meshCount ; ++m)
+        for (atUint32 m=0 ; m<head.meshCount ; ++m)
         {
             curSec += DNACMDL::ReadGeomSectionsToBlender<PAKRouter<PAKBridge>, MaterialSet, RigPair, DNACMDL::SurfaceHeader_3>
                           (os, drs, pakRouter, entry, dummy, true,
@@ -195,7 +195,7 @@ bool MREA::Extract(const SpecBase& dataSpec,
     /* Skip SOBJ (SCLY) */
     if (secIdxIt->first == FOURCC('SOBJ'))
     {
-        for (int l=0 ; l<head.sclyLayerCount ; ++l)
+        for (atUint32 l=0 ; l<head.sclyLayerCount ; ++l)
             drs.seek(head.secSizes[curSec++], Athena::Current);
         ++secIdxIt;
     }
diff --git a/DataSpec/SpecMP1.cpp b/DataSpec/SpecMP1.cpp
index c5615ea32..cb0c1e759 100644
--- a/DataSpec/SpecMP1.cpp
+++ b/DataSpec/SpecMP1.cpp
@@ -268,7 +268,7 @@ struct SpecMP1 : SpecBase
 
     bool checkPathPrefix(const HECL::ProjectPath& path)
     {
-        return path.getRelativePath().compare(0, 4, "MP1/") == 0;
+        return path.getRelativePath().compare(0, 4, _S("MP1/")) == 0;
     }
 
     bool validateYAMLDNAType(FILE* fp) const
diff --git a/DataSpec/SpecMP2.cpp b/DataSpec/SpecMP2.cpp
index cc27f24ad..cce85c6bd 100644
--- a/DataSpec/SpecMP2.cpp
+++ b/DataSpec/SpecMP2.cpp
@@ -258,7 +258,7 @@ struct SpecMP2 : SpecBase
 
     bool checkPathPrefix(const HECL::ProjectPath& path)
     {
-        return path.getRelativePath().compare(0, 4, "MP2/") == 0;
+        return path.getRelativePath().compare(0, 4, _S("MP2/")) == 0;
     }
 
     bool validateYAMLDNAType(FILE* fp) const
diff --git a/DataSpec/SpecMP3.cpp b/DataSpec/SpecMP3.cpp
index 4a785ca5f..326bf51da 100644
--- a/DataSpec/SpecMP3.cpp
+++ b/DataSpec/SpecMP3.cpp
@@ -439,7 +439,7 @@ struct SpecMP3 : SpecBase
 
     bool checkPathPrefix(const HECL::ProjectPath& path)
     {
-        return path.getRelativePath().compare(0, 4, "MP3/") == 0;
+        return path.getRelativePath().compare(0, 4, _S("MP3/")) == 0;
     }
 
     bool validateYAMLDNAType(FILE* fp) const
diff --git a/MathLib b/MathLib
index 57cfbc93b..72972196a 160000
--- a/MathLib
+++ b/MathLib
@@ -1 +1 @@
-Subproject commit 57cfbc93b935b03edb3a1311b8c61afc1f69ae79
+Subproject commit 72972196a4ebf8d41ba9e5c212fe89cd796f97eb
diff --git a/Runtime/MP1/main.cpp b/Runtime/MP1/main.cpp
index c32824a9c..c80f33064 100644
--- a/Runtime/MP1/main.cpp
+++ b/Runtime/MP1/main.cpp
@@ -1,4 +1,7 @@
 #if _WIN32
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <objbase.h>
 #endif
 
diff --git a/hecl b/hecl
index b33c31a34..7dd981997 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit b33c31a34bf8f2c8d13ac923abe58da624814368
+Subproject commit 7dd98199713427ee1c998387bc4714b2898eaccb