Replace std::sinf to sinf. More Linux header fix

OpenXRay · Sep 29, 2018 · 9766763 · 9766763
1 parent cb65b4e
commit 9766763
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/Layers/xrRender/HWCaps.cpp b/src/Layers/xrRender/HWCaps.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "hwcaps.h"
-#include "hw.h"
+#include "HWCaps.h"
+#include "HW.h"
 
 #if !defined(_EDITOR) && !defined(USE_OGL)
 #include <nvapi.h>

diff --git a/src/Layers/xrRender/ParticleEffect.cpp b/src/Layers/xrRender/ParticleEffect.cpp
@@ -464,8 +464,8 @@ void ParticleRenderStream(PRS_PARAMS* pParams)
         if (angle != m.rot.x)
         {
             angle = m.rot.x;
-            sina = std::sinf(angle);
-            cosa = std::cosf(angle);
+            sina = sinf(angle);
+            cosa = cosf(angle);
         }
 
         _mm_prefetch(64 + (char*)&particles[i + 1], _MM_HINT_NTA);

diff --git a/src/Layers/xrRender/R_Backend_Runtime.cpp b/src/Layers/xrRender/R_Backend_Runtime.cpp
@@ -1,12 +1,14 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#if defined(WINDOWS)
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
 #pragma warning(pop)
+#endif
 
-#include "xrCDB/frustum.h"
+#include "xrCDB/Frustum.h"
 
 #if defined(USE_DX10) || defined(USE_DX11)
 #include "Layers/xrRenderDX10/StateManager/dx10StateManager.h"

diff --git a/src/Layers/xrRender/ResourceManager.cpp b/src/Layers/xrRender/ResourceManager.cpp
@@ -5,17 +5,19 @@
 #include "stdafx.h"
 #pragma hdrstop
 
+#if defined(WINDOWS)
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include <d3dx9.h>
 #pragma warning(pop)
+#endif
 
 #include <tbb/parallel_for_each.h>
 
 #include "ResourceManager.h"
 #include "tss.h"
-#include "blenders/blender.h"
-#include "blenders/blender_recorder.h"
+#include "blenders/Blender.h"
+#include "blenders/Blender_Recorder.h"
 #include "xrCore/Threading/ThreadPool.hpp"
 
 //	Already defined in Texture.cpp

diff --git a/src/Layers/xrRender/ResourceManager_Loader.cpp b/src/Layers/xrRender/ResourceManager_Loader.cpp
@@ -2,7 +2,7 @@
 #pragma hdrstop
 
 #include "ResourceManager.h"
-#include "blenders/blender.h"
+#include "blenders/Blender.h"
 
 void CResourceManager::OnDeviceDestroy(BOOL)
 {