xrCDB,xrCore: fix win build

OpenXRay · Aug 2, 2018 · 5037b4b · 5037b4b
1 parent d6c3543
commit 5037b4b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/src/xrCDB/ISpatial_q_ray.cpp b/src/xrCDB/ISpatial_q_ray.cpp
@@ -2,6 +2,7 @@
 #include "ISpatial.h"
 #include "xrCore/_fbox.h"
 #include "xrCore/Threading/Lock.hpp"
+#include "SDL.h"
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include <xmmintrin.h>

diff --git a/src/xrCDB/xrCDB_ray.cpp b/src/xrCDB/xrCDB_ray.cpp
@@ -7,6 +7,7 @@
 #pragma warning(pop)
 
 #include "xrCDB.h"
+#include "SDL.h"
 
 using namespace CDB;
 using namespace Opcode;

diff --git a/src/xrCore/_math.cpp b/src/xrCore/_math.cpp
@@ -23,8 +23,9 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <chrono>
-#include <thread>
 #endif
+#include <thread>
+#include "SDL.h"
 
 typedef struct _PROCESSOR_POWER_INFORMATION
 {

diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp
@@ -11,6 +11,7 @@
 #include "Threading/ThreadPool.hpp"
 #include "Math/MathUtil.hpp"
 #include "xrCore/_std_extensions.h"
+#include "SDL.h"
 
 #pragma comment(lib, "winmm.lib")
 

diff --git a/src/xrCore/xrstring.h b/src/xrCore/xrstring.h
@@ -206,7 +206,7 @@ IC void xr_strlwr(shared_str& src)
         int i = 0;
         while(lp[i])
         {
-            lp[i] = (char) std::toupper(lp[i], std::locale());
+            lp[i] = (char) std::tolower(lp[i], std::locale());
             i++;
         }
 #endif
@@ -220,7 +220,7 @@ IC char * xr_strlwr(char * src)
     int i = 0;
     while(src[i])
     {
-    	src[i] = (char) toupper(src[i]);// TODO rewrite locale-independent toupper_l()
+    	src[i] = (char) tolower(src[i]);// TODO rewrite locale-independent toupper_l()
     	i++;
     }
     return src;