Ver código fonte

Build: Fixing Linux build and updating dependencies

Marko Pintera 8 anos atrás
pai
commit
66abaee367

+ 2 - 1
Source/BansheeCore/BsCorePrerequisites.h

@@ -209,6 +209,7 @@
 #endif
 #endif
 
 
 #include "Localization/BsHString.h"
 #include "Localization/BsHString.h"
+#include "String/BsStringID.h"
 
 
 namespace bs 
 namespace bs 
 {
 {
@@ -713,4 +714,4 @@ namespace bs
 	#define BS_ALL_LAYERS 0xFFFFFFFFFFFFFFFF
 	#define BS_ALL_LAYERS 0xFFFFFFFFFFFFFFFF
 }
 }
 
 
-#include "Utility/BsCommonTypes.h"
+#include "Utility/BsCommonTypes.h"

+ 2 - 1
Source/BansheeCore/Material/BsTechnique.h

@@ -6,6 +6,7 @@
 #include "Reflection/BsIReflectable.h"
 #include "Reflection/BsIReflectable.h"
 #include "CoreThread/BsCoreObject.h"
 #include "CoreThread/BsCoreObject.h"
 #include "Material/BsShaderVariation.h"
 #include "Material/BsShaderVariation.h"
+#include "String/BsStringID.h"
 
 
 namespace bs
 namespace bs
 {
 {
@@ -177,4 +178,4 @@ namespace bs
 
 
 	/** @} */
 	/** @} */
 	}
 	}
-}
+}

+ 0 - 2
Source/BansheeUtility/Allocators/BsFreeAlloc.h

@@ -2,8 +2,6 @@
 //**************** Copyright (c) 2017 Marko Pintera ([email protected]). All rights reserved. **********************//
 //**************** Copyright (c) 2017 Marko Pintera ([email protected]). All rights reserved. **********************//
 #pragma once
 #pragma once
 
 
-#include "Prerequisites/BsPrerequisitesUtil.h"
-
 namespace bs
 namespace bs
 {
 {
 	/** @addtogroup Internal-Utility
 	/** @addtogroup Internal-Utility

+ 1 - 0
Source/BansheeUtility/Allocators/BsPoolAlloc.h

@@ -3,6 +3,7 @@
 #pragma once
 #pragma once
 
 
 #include "Prerequisites/BsPrerequisitesUtil.h"
 #include "Prerequisites/BsPrerequisitesUtil.h"
+#include <climits>
 
 
 namespace bs
 namespace bs
 {
 {

+ 2 - 1
Source/BansheeUtility/Math/BsDegree.cpp

@@ -1,5 +1,6 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
+#include "Prerequisites/BsPrerequisitesUtil.h"
 #include "Math/BsDegree.h"
 #include "Math/BsDegree.h"
 #include "Math/BsMath.h"
 #include "Math/BsMath.h"
 
 
@@ -48,4 +49,4 @@ namespace bs
 	{
 	{
 		return mDeg * Math::DEG2RAD;
 		return mDeg * Math::DEG2RAD;
 	}
 	}
-}
+}

+ 2 - 1
Source/BansheeUtility/Math/BsDegree.h

@@ -2,7 +2,8 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #pragma once
 #pragma once
 
 
-#include "Prerequisites/BsPrerequisitesUtil.h"
+#include "Prerequisites/BsPlatformDefines.h"
+#include "Prerequisites/BsRTTIPrerequisites.h"
 
 
 namespace bs
 namespace bs
 {
 {

+ 1 - 0
Source/BansheeUtility/Math/BsRadian.cpp

@@ -1,5 +1,6 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
+#include "Prerequisites/BsPrerequisitesUtil.h"
 #include "Math/BsRadian.h"
 #include "Math/BsRadian.h"
 #include "Math/BsMath.h"
 #include "Math/BsMath.h"
 
 

+ 2 - 1
Source/BansheeUtility/Math/BsRadian.h

@@ -2,7 +2,8 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 #pragma once
 #pragma once
 
 
-#include "Prerequisites/BsPrerequisitesUtil.h"
+#include "Prerequisites/BsPlatformDefines.h"
+#include "Prerequisites/BsRTTIPrerequisites.h"
 
 
 namespace bs
 namespace bs
 {
 {

+ 1 - 2
Source/BansheeUtility/Prerequisites/BsPrerequisitesUtil.h

@@ -273,7 +273,6 @@
 #include "Prerequisites/BsRTTIPrerequisites.h"
 #include "Prerequisites/BsRTTIPrerequisites.h"
 
 
 #include "String/BsString.h"
 #include "String/BsString.h"
-#include "String/BsStringID.h"
 #include "Utility/BsMessageHandlerFwd.h"
 #include "Utility/BsMessageHandlerFwd.h"
 #include "Utility/BsFlags.h"
 #include "Utility/BsFlags.h"
 #include "Utility/BsUtil.h"
 #include "Utility/BsUtil.h"
@@ -281,4 +280,4 @@
 #include "Utility/BsPlatformUtility.h"
 #include "Utility/BsPlatformUtility.h"
 #include "Utility/BsNonCopyable.h"
 #include "Utility/BsNonCopyable.h"
 #include "FileSystem/BsPath.h"
 #include "FileSystem/BsPath.h"
-#include "Error/BsCrashHandler.h"
+#include "Error/BsCrashHandler.h"