Merge branch 'Kaffeine-dev' into dev

OpenXRay · Jul 19, 2016 · e9bc987 · e9bc987
2 parents 2315534 + 16af9bb
commit e9bc987
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 17 deletions.
diff --git a/src/Common/Compiler.inl b/src/Common/Compiler.inl
@@ -14,6 +14,12 @@
 #define XR_IMPORT __declspec(dllimport)
 #endif
 
+#if defined(__GNUC__)
+#define XR_ASSUME(expr)  if (expr){} else __builtin_unreachable()
+#elif defined(_MSC_VER)
+#define XR_ASSUME(expr) __assume(expr)
+#endif
+
 #if defined(__GNUC__)
 #define NO_INLINE __attribute__((noinline))
 #define FORCE_INLINE __attribute__((always_inline)) inline

diff --git a/src/Common/Platform.hpp b/src/Common/Platform.hpp
@@ -18,7 +18,6 @@
 #include "Common/Compiler.inl"
 
 #include <ctime>
-#include <sys\utime.h>
 
 #if defined(LINUX)
 #include "Common/PlatformLinux.inl"

diff --git a/src/Common/PlatformWindows.inl b/src/Common/PlatformWindows.inl
@@ -7,6 +7,8 @@
 #define _WIN32_WINNT 0x0501
 #endif
 
+#include <sys/utime.h>
+
 #define NOGDICAPMASKS
 //#define NOSYSMETRICS
 #define NOMENUS

diff --git a/src/xrCore/memory_allocation_stats.cpp b/src/xrCore/memory_allocation_stats.cpp
@@ -58,7 +58,7 @@ void mem_alloc_clear_stats()
     stats.clear();
 }
 
-__declspec(noinline) void save_stack_trace()
+NO_INLINE void save_stack_trace()
 {
     if (!StatsGatherEnabled)
         return;

diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h
@@ -122,7 +122,7 @@
 #include "xrsharedmem.h"
 #include "xrstring.h"
 #include "xr_resource.h"
-#include "Compression\rt_compressor.h"
+#include "Compression/rt_compressor.h"
 #include "xr_shared.h"
 #include "string_concatenations.h"
 

diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj
@@ -104,7 +104,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)Externals;$(SolutionDir)Externals\openssl\include;$(SolutionDir)Externals\lzo-2.02\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Externals;$(SolutionDir)Externals\openssl\include;$(SolutionDir)Externals\lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;XRCORE_EXPORTS;CRYPTO_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -137,7 +137,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>false</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>$(SolutionDir)Externals;$(SolutionDir)Externals\openssl\include;$(SolutionDir)Externals\lzo-2.02\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Externals;$(SolutionDir)Externals\openssl\include;$(SolutionDir)Externals\lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;XRCORE_EXPORTS;CRYPTO_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

diff --git a/src/xrCore/xrDebug_macros.h b/src/xrCore/xrDebug_macros.h
@@ -99,7 +99,7 @@
 #ifdef __BORLANDC__
 #define NODEFAULT
 #else
-#define NODEFAULT __assume(0)
+#define NODEFAULT XR_ASSUME(0)
 #endif
 #define VERIFY(expr) do {} while (false)
 #define VERIFY2(expr, desc) do {} while (false)

diff --git a/src/xrGame/accumulative_states.h b/src/xrGame/accumulative_states.h
@@ -1,6 +1,8 @@
 #ifndef ACCUMULATIVE_STATES_INCLUDED
 #define ACCUMULATIVE_STATES_INCLUDED
 
+#include <loki/Typelist.h>
+
 namespace award_system
 {
 

diff --git a/src/xrServerEntities/alife_space.h b/src/xrServerEntities/alife_space.h
@@ -139,11 +139,10 @@ namespace ALife {
 		eCombatTypeDummy = u32(-1),
 	};
 
-	//âîçìîæíîñòü ïîäêëþ÷åíèÿ àääîíîâ
-	enum EWeaponAddonStatus{
-		eAddonDisabled				= 0,	//íåëüçÿ ïðèñîåäåíèòü
-		eAddonPermanent				= 1,	//ïîñòîÿííî ïîäêëþ÷åíî ïî óìîë÷àíèþ
-		eAddonAttachable			= 2		//ìîæíî ïðèñîåäèíÿòü
+        enum EWeaponAddonStatus {
+                eAddonDisabled				= 0,
+                eAddonPermanent				= 1,
+                eAddonAttachable			= 2
 	};
 
 	IC EHitType	g_tfString2HitType(LPCSTR caHitType)
@@ -178,7 +177,7 @@ namespace ALife {
 #endif
 	}
 #ifndef	_EDITOR
-xr_token							hit_types_token							[ ];
+        extern xr_token							hit_types_token							[ ];
 
 	IC LPCSTR g_cafHitType2String(EHitType tHitType)
 	{
@@ -195,4 +194,4 @@ xr_token							hit_types_token							[ ];
 	DEFINE_MAP		(_STORY_ID,					CSE_ALifeDynamicObject*,		STORY_P_MAP,				STORY_P_PAIR_IT);
 };
 
-#endif //XRAY_ALIFE_SPACE
+#endif //XRAY_ALIFE_SPACE
diff --git a/src/xrServerEntities/smart_cast.h b/src/xrServerEntities/smart_cast.h
@@ -13,13 +13,13 @@
 #	define PURE_DYNAMIC_CAST
 #endif // DEBUG
 
-#define  TL_FAST_COMPILATION
-#undef   STATIC_CHECK
-#include <loki/typelist.h>
-
 #ifdef PURE_DYNAMIC_CAST
 #	define smart_cast dynamic_cast
 #else
+#define TL_FAST_COMPILATION
+#undef STATIC_CHECK
+#       include <loki/Typelist.h>
+
 #	define PURE_DYNAMIC_CAST_COMPATIBILITY_CHECK
 
 #	ifdef DEBUG