Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

2015-08-11 21:41:58 +01:00
parent 6b0e63e054 88c150abf7
commit 19764bb4fb
54 changed files with 6143 additions and 355 deletions
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -223,7 +223,9 @@

 	#include <malloc.h> // alloca()
 	#define NORETURN __declspec(noreturn)
-	#define inline __forceinline
+	#if (_MSC_VER < 1900)
+		#define inline __forceinline
+	#endif

 	#if !defined(WINCE)
 		#define CDECL _cdecl