LINUX, X86: fix x86 linux building

OpenXRay · Sep 22, 2018 · 966a40b · 966a40b
1 parent a66bfbf
commit 966a40b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/xrCommon/xr_unordered_map.h b/src/xrCommon/xr_unordered_map.h
@@ -1,9 +1,9 @@
 #pragma once
-//#include <unordered_map>
-#include "unordered_map.hpp"
+#include <unordered_map>
+//#include "unordered_map.hpp"
 #include "xrCore/xrMemory.h"
 
 template <typename K, class V, class Hasher = std::hash<K>, class Traits = std::equal_to<K>,
           typename allocator = tbb::tbb_allocator<std::pair<const K, V>>>
-//using xr_unordered_map = std::unordered_map<K, V, Hasher, Traits, allocator>;
-using xr_unordered_map = ska::unordered_map<K, V, Hasher, Traits, allocator>;
+using xr_unordered_map = std::unordered_map<K, V, Hasher, Traits, allocator>;
+//using xr_unordered_map = ska::unordered_map<K, V, Hasher, Traits, allocator>;
diff --git a/src/xrCore/Math/MathUtil.cpp b/src/xrCore/Math/MathUtil.cpp
@@ -13,7 +13,7 @@
 #include "Layers/xrRender/light.h"
 #endif
 #include "PLC_SSE.hpp"
-#ifdef XR_X86
+#if defined(WINDOWS) and defined(XR_X86)
 #include "SkinXW_SSE.hpp"
 #else
 #include "SkinXW_CPP.hpp"
@@ -39,7 +39,7 @@ void Initialize()
     static bool initialized = false;
     if (initialized)
         return;
-#ifdef XR_X86
+#if defined(WINDOWS) and defined(XR_X86)
     Skin1W = Skin1W_SSE;
     Skin2W = Skin2W_SSE;
     Skin3W = Skin3W_SSE;

diff --git a/src/xrCore/Math/SkinXW_SSE.cpp b/src/xrCore/Math/SkinXW_SSE.cpp
@@ -12,7 +12,7 @@ namespace XRay
 {
 namespace Math
 {
-#ifdef XR_X86
+#if defined(WINDOWS) and defined(XR_X86)
 #define transform_dir(idx, res, SX, SY, SZ, T1) \
     \
 __asm movzx eax,                                \

diff --git a/src/xrCore/Math/SkinXW_SSE.hpp b/src/xrCore/Math/SkinXW_SSE.hpp
@@ -12,7 +12,7 @@ namespace XRay
 {
 namespace Math
 {
-#ifdef XR_X86
+#if defined(WINDOWS) and defined(XR_X86)
 void Skin1W_SSE(vertRender* D, vertBoned1W* S, u32 vCount, CBoneInstance* Bones);
 void Skin2W_SSE(vertRender* D, vertBoned2W* S, u32 vCount, CBoneInstance* Bones);
 void Skin3W_SSE(vertRender* D, vertBoned3W* S, u32 vCount, CBoneInstance* Bones);

diff --git a/src/xrCore/xrDebug.cpp b/src/xrCore/xrDebug.cpp
@@ -67,7 +67,7 @@ static BOOL bException = FALSE;
 #error CPU architecture is not supported.
 #endif
 
-namespace
+/*namespace
 {
 ICN void* GetInstructionPtr()
 {
@@ -92,7 +92,7 @@ ICN void* GetInstructionPtr()
 #endif
 #endif
 }
-}
+}*/
 
 // XXX: Probably rename this to AssertionResult?
 enum MessageBoxResult