araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Debug build fix

Browse Source
This commit is contained in:
Shauren
2022-02-13 13:12:44 +01:00
parent ad4f4bfab7
commit 904299413e
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dep/g3dlite/G3D-v9.0 hotfix15.diff
View File

@@ -194,6 +194,27 @@ index 24521efc93..0f0ea459df 100644
#include "G3D/HashTrait.h"
#include "G3D/PositionTrait.h"
#include <string>
diff --git a/dep/g3dlite/include/G3D/debugAssert.h b/dep/g3dlite/include/G3D/debugAssert.h
index edff671061..197312bd12 100644
--- a/dep/g3dlite/include/G3D/debugAssert.h
+++ b/dep/g3dlite/include/G3D/debugAssert.h
@@ -32,6 +32,7 @@
#include <cstdlib>
#ifdef _MSC_VER
+#include <intrin.h>
// conditional expression is constant
# pragma warning (disable : 4127)
#endif
@@ -116,7 +117,7 @@ namespace _internal {
#ifdef G3D_DEBUG
# if defined(_MSC_VER)
-# define rawBreak() ::DebugBreak();
+# define rawBreak() ::__debugbreak();
# elif defined(__i386__)
// gcc on intel
# define rawBreak() __asm__ __volatile__ ( "int $3" );
diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
index d043f21491..9202fe41d0 100644
--- a/dep/g3dlite/include/G3D/platform.h
@@ -265,15 +286,3 @@ index 3c3e43a0af..ff843fb7ee 100644
// disable: "C++ exception handler used"
# pragma warning (push)
# pragma warning (disable : 4530)
diff --git a/src/server/game/DataStores/M2Stores.cpp b/src/server/game/DataStores/M2Stores.cpp
index c5eb43fdf2..b55b5a9699 100644
--- a/src/server/game/DataStores/M2Stores.cpp
+++ b/src/server/game/DataStores/M2Stores.cpp
@@ -23,6 +23,7 @@
#include "M2Structure.h"
#include "World.h"
#include <boost/filesystem/path.hpp>
+#include <G3D/Vector4.h>
#include <fstream>
#include <iostream>
#include <iomanip>

3
dep/g3dlite/include/G3D/debugAssert.h
View File

@@ -32,6 +32,7 @@
#include <cstdlib>
#ifdef _MSC_VER
#include <intrin.h>
// conditional expression is constant
# pragma warning (disable : 4127)
#endif
@@ -116,7 +117,7 @@ namespace _internal {
#ifdef G3D_DEBUG
# if defined(_MSC_VER)
# define rawBreak() ::DebugBreak();
# define rawBreak() ::__debugbreak();
# elif defined(__i386__)
// gcc on intel
# define rawBreak() __asm__ __volatile__ ( "int $3" );