Windows fixes

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 project(PathShagged)
 if(MSVC)
   # Shaddup MSVC
-  add_definitions(-DUNICODE=1 -D_UNICODE=1 -D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 /wd4267 /wd4244 /wd4305)
+  add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1 -D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 /wd4267 /wd4244 /wd4305)
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wno-multichar -fno-exceptions")
 endif()

DataSpec/DNACommon/CMDL.hpp

@@ -1137,7 +1137,7 @@ bool WriteCMDL(const HECL::ProjectPath& outPath, const HECL::ProjectPath& inPath
                 const HECL::SystemString& relPath = path.getRelativePath();
 
                 /* TODO: incorporate hecl hashes */
-                size_t search = relPath.find("TXTR_");
+                size_t search = relPath.find(_S("TXTR_"));
                 if (search != HECL::SystemString::npos)
                     targetMSet.addTexture(relPath.c_str() + search + 5);
                 else

DataSpec/DNACommon/DNACommon.hpp

@@ -87,6 +87,13 @@ public:
         copy[8] = '\0';
         m_id = strtoul(copy, nullptr, 16);
     }
+    UniqueID32(const wchar_t* hexStr)
+    {
+        wchar_t copy[9];
+        wcsncpy(copy, hexStr, 8);
+        copy[8] = L'\0';
+        m_id = wcstoul(copy, nullptr, 16);
+    }
 
     static constexpr size_t BinarySize() {return 4;}
 };
@@ -131,7 +138,22 @@ public:
         char copy[17];
         strncpy(copy, hexStr, 16);
         copy[16] = '\0';
+#if _WIN32
+        m_id = _strtoui64(copy, nullptr, 16);
+#else
         m_id = strtouq(copy, nullptr, 16);
+#endif
+    }
+    UniqueID64(const wchar_t* hexStr)
+    {
+        wchar_t copy[17];
+        wcsncpy(copy, hexStr, 16);
+        copy[16] = L'\0';
+#if _WIN32
+        m_id = _wcstoui64(copy, nullptr, 16);
+#else
+        m_id = wcstouq(copy, nullptr, 16);
+#endif
     }
 
     static constexpr size_t BinarySize() {return 8;}

DataSpec/DNAMP1/DNAMP1.cpp

@@ -151,7 +151,11 @@ void PAKBridge::build()
                 HECL::SNPrintf(num, 16, _S("%02u "), ai);
                 areaDeps.name = num + areaDeps.name;
 
+#if HECL_UCS2
+                std::string lowerName = HECL::WideToUTF8(areaDeps.name);
+#else
                 std::string lowerName(areaDeps.name);
+#endif
                 for (char& ch : lowerName)
                 {
                     ch = tolower(ch);

Runtime/MP1/main.cpp

@@ -167,7 +167,7 @@ void CMain::LoadAudio()
 int CMain::appMain(boo::IApplication* app)
 {
     Zeus::detectCPU();
-    mainWindow = app->newWindow("Metroid Prime 1 Reimplementation vZygote");
+    mainWindow = app->newWindow(_S("Metroid Prime 1 Reimplementation vZygote"));
     mainWindow->showWindow();
     TOneStatic<CGameGlobalObjects> globalObjs;
     InitializeSubsystems();