فهرست منبع

Fixing compilation errors caused by include file order

BearishSun 9 سال پیش
والد
کامیت
ccc4f31597

+ 2 - 5
Source/BansheeUtility/Include/BsCrashHandler.h

@@ -2,10 +2,6 @@
 //**************** 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 "BsPath.h"
-#include "BsPlatformDefines.h"
-#include "BsString.h"
-
 #define BS_MAX_STACKTRACE_DEPTH 200
 #define BS_MAX_STACKTRACE_DEPTH 200
 #define BS_MAX_STACKTRACE_NAME_BYTES 1024
 #define BS_MAX_STACKTRACE_NAME_BYTES 1024
 
 
@@ -95,8 +91,9 @@ namespace BansheeEngine
 		static const String sCrashReportFolder;
 		static const String sCrashReportFolder;
 		/** The name of the HTML crash log file. */
 		/** The name of the HTML crash log file. */
 		static const String sCrashLogName;
 		static const String sCrashLogName;
-
+		/** Error message to display on program failure. */
 		static const String sFatalErrorMsg;
 		static const String sFatalErrorMsg;
+
 #if BS_PLATFORM == BS_PLATFORM_WIN32
 #if BS_PLATFORM == BS_PLATFORM_WIN32
 		struct Data;
 		struct Data;
 		Data* m;
 		Data* m;

+ 1 - 2
Source/BansheeUtility/Source/BsCrashHandler.cpp

@@ -1,7 +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 "BsCrashHandler.h"
-
+#include "BsPrerequisitesUtil.h"
 #include "BsDebug.h"
 #include "BsDebug.h"
 #include "BsFileSystem.h"
 #include "BsFileSystem.h"
 #include "BsPath.h"
 #include "BsPath.h"

+ 1 - 1
Source/BansheeUtility/Source/Unix/BsUnixCrashHandler.cpp

@@ -1,6 +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 "BsCrashHandler.h"
+#include "BsPrerequisitesUtil.h"
 
 
 #include "BsDebug.h"
 #include "BsDebug.h"
 #include "BsFileSystem.h"
 #include "BsFileSystem.h"

+ 0 - 2
Source/BansheeUtility/Source/Win32/BsWin32CrashHandler.cpp

@@ -1,7 +1,5 @@
 //********************************** 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 "BsCrashHandler.h"
-
 #include "BsPrerequisitesUtil.h"
 #include "BsPrerequisitesUtil.h"
 #include "BsDebug.h"
 #include "BsDebug.h"
 #include "BsDynLib.h"
 #include "BsDynLib.h"