xrEngine: hide include xrSASH under define for linux build

OpenXRay · Aug 1, 2018 · 7d819cf · 7d819cf
1 parent 2e79055
commit 7d819cf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/src/xrEngine/Environment_misc.cpp b/src/xrEngine/Environment_misc.cpp
@@ -649,7 +649,7 @@ void CEnvironment::load_weather_effects()
         sections_type& sections = config->sections();
 
         env.reserve(sections.size() + 2);
-        env.push_back(create_descriptor("00:00:00", false));
+        env.push_back(create_descriptor("00:00:00", nullptr));
 
         sections_type::const_iterator i2 = sections.begin();
         sections_type::const_iterator e2 = sections.end();
@@ -661,7 +661,7 @@ void CEnvironment::load_weather_effects()
 
         CInifile::Destroy(config);
 
-        env.push_back(create_descriptor("24:00:00", false));
+        env.push_back(create_descriptor("24:00:00", nullptr));
         env.back()->exec_time_loaded = DAY_LENGTH;
     }
 

diff --git a/src/xrEngine/FDemoPlay.cpp b/src/xrEngine/FDemoPlay.cpp
@@ -10,8 +10,9 @@
 #include "Render.h"
 #include "CameraManager.h"
 
+#if !defined(LINUX)
 #include "xrSASH.h"
-
+#endif
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

diff --git a/src/xrEngine/device.cpp b/src/xrEngine/device.cpp
@@ -25,7 +25,9 @@
 #include "Include/editor/ide.hpp"
 #include "engine_impl.hpp"
 
+#if !defined(LINUX)
 #include "xrSASH.h"
+#endif
 #include "IGame_Persistent.h"
 #include "xrScriptEngine/ScriptExporter.hpp"
 #include "XR_IOConsole.h"

diff --git a/src/xrEngine/main.cpp b/src/xrEngine/main.cpp
@@ -24,7 +24,9 @@
 #define CTextConsole CConsole
 #pragma todo("Implement text console or it's alternative")
 #endif
+#if !defined(LINUX)
 #include "xrSASH.h"
+#endif
 #include "xr_ioc_cmd.h"
 
 #ifdef MASTER_GOLD

diff --git a/src/xrEngine/x_ray.cpp b/src/xrEngine/x_ray.cpp
@@ -15,7 +15,9 @@
 #include "std_classes.h"
 #include "GameFont.h"
 #include "xrCDB/ISpatial.h"
+#if !defined(LINUX)
 #include "xrSASH.h"
+#endif
 #include "xrServerEntities/smart_cast.h"
 #include "xr_input.h"
 

diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp
@@ -4,7 +4,9 @@
 #include "x_ray.h"
 #include "XR_IOConsole.h"
 #include "xr_ioc_cmd.h"
+#if !defined(LINUX)
 #include "xrSASH.h"
+#endif
 
 #include "CameraManager.h"
 #include "Environment.h"