From 34f69a5b1ef2980fc17b8bfb5887f7616241415a Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 31 Jan 2023 22:13:40 +0100
Subject: [PATCH] Move crashhandler implementation to tier0
---
r5dev/core/dllmain.cpp | 2 +-
r5dev/launcher/launcher.cpp | 2 +-
r5dev/materialsystem/cmaterialsystem.cpp | 2 +-
r5dev/{public/utility => tier0}/crashhandler.cpp | 2 +-
r5dev/{public/utility => tier0}/crashhandler.h | 0
r5dev/vproj/clientsdk.vcxproj | 4 ++--
r5dev/vproj/clientsdk.vcxproj.filters | 12 ++++++------
r5dev/vproj/dedicated.vcxproj | 4 ++--
r5dev/vproj/dedicated.vcxproj.filters | 12 ++++++------
r5dev/vproj/gamesdk.vcxproj | 4 ++--
r5dev/vproj/gamesdk.vcxproj.filters | 12 ++++++------
11 files changed, 28 insertions(+), 28 deletions(-)
rename r5dev/{public/utility => tier0}/crashhandler.cpp (99%)
rename r5dev/{public/utility => tier0}/crashhandler.h (100%)
diff --git a/r5dev/core/dllmain.cpp b/r5dev/core/dllmain.cpp
index c5674abf..38ef2c65 100644
--- a/r5dev/core/dllmain.cpp
+++ b/r5dev/core/dllmain.cpp
@@ -2,6 +2,7 @@
#include "core/r5dev.h"
#include "core/init.h"
#include "core/logdef.h"
+#include "tier0/crashhandler.h"
/*****************************************************************************/
#ifndef DEDICATED
#include "windows/id3dx.h"
@@ -11,7 +12,6 @@
#include "windows/system.h"
#include "mathlib/mathlib.h"
#include "launcher/launcher.h"
-#include "public/utility/crashhandler.h"
//#############################################################################
// INITIALIZATION
diff --git a/r5dev/launcher/launcher.cpp b/r5dev/launcher/launcher.cpp
index 1a5642e0..6f816d24 100644
--- a/r5dev/launcher/launcher.cpp
+++ b/r5dev/launcher/launcher.cpp
@@ -5,9 +5,9 @@
// $NoKeywords: $
//===========================================================================//
#include "core/stdafx.h"
+#include "tier0/crashhandler.h"
#include "tier0/commandline.h"
#include "tier1/strtools.h"
-#include "public/utility/crashhandler.h"
#include "launcher/launcher.h"
int HWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
diff --git a/r5dev/materialsystem/cmaterialsystem.cpp b/r5dev/materialsystem/cmaterialsystem.cpp
index 3409a2ff..b124beea 100644
--- a/r5dev/materialsystem/cmaterialsystem.cpp
+++ b/r5dev/materialsystem/cmaterialsystem.cpp
@@ -4,8 +4,8 @@
//
//===========================================================================//
#include "core/stdafx.h"
+#include "tier0/crashhandler.h"
#include "tier1/cvar.h"
-#include "public/utility/crashhandler.h"
#include "vpc/keyvalues.h"
#include "rtech/rtech_utils.h"
#include "engine/cmodel_bsp.h"
diff --git a/r5dev/public/utility/crashhandler.cpp b/r5dev/tier0/crashhandler.cpp
similarity index 99%
rename from r5dev/public/utility/crashhandler.cpp
rename to r5dev/tier0/crashhandler.cpp
index f7201448..3d4db9c5 100644
--- a/r5dev/public/utility/crashhandler.cpp
+++ b/r5dev/tier0/crashhandler.cpp
@@ -6,8 +6,8 @@
#include "core/stdafx.h"
#include "core/logdef.h"
#include "tier0/cpu.h"
+#include "tier0/crashhandler.h"
#include "public/utility/binstream.h"
-#include "public/utility/crashhandler.h"
//-----------------------------------------------------------------------------
// Purpose:
diff --git a/r5dev/public/utility/crashhandler.h b/r5dev/tier0/crashhandler.h
similarity index 100%
rename from r5dev/public/utility/crashhandler.h
rename to r5dev/tier0/crashhandler.h
diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj
index da36015f..01f361d3 100644
--- a/r5dev/vproj/clientsdk.vcxproj
+++ b/r5dev/vproj/clientsdk.vcxproj
@@ -110,7 +110,6 @@
-
@@ -129,6 +128,7 @@
+
@@ -346,7 +346,6 @@
-
@@ -549,6 +548,7 @@
+
diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters
index 29176260..bea9a981 100644
--- a/r5dev/vproj/clientsdk.vcxproj.filters
+++ b/r5dev/vproj/clientsdk.vcxproj.filters
@@ -651,9 +651,6 @@
sdk\public\utility
-
- sdk\public\utility
-
sdk\game\shared
@@ -681,6 +678,9 @@
sdk\public\appframework
+
+ sdk\tier0
+
@@ -1904,9 +1904,6 @@
sdk\public\utility
-
- sdk\public\utility
-
sdk\public
@@ -1994,6 +1991,9 @@
sdk\public\appframework
+
+ sdk\tier0
+
diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj
index f08d9f5e..c592efe8 100644
--- a/r5dev/vproj/dedicated.vcxproj
+++ b/r5dev/vproj/dedicated.vcxproj
@@ -279,7 +279,6 @@
-
@@ -472,6 +471,7 @@
+
@@ -613,7 +613,6 @@
-
@@ -632,6 +631,7 @@
+
diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters
index df44a92c..aec969ac 100644
--- a/r5dev/vproj/dedicated.vcxproj.filters
+++ b/r5dev/vproj/dedicated.vcxproj.filters
@@ -1263,9 +1263,6 @@
sdk\public\utility
-
- sdk\public\utility
-
sdk\public
@@ -1386,6 +1383,9 @@
sdk\public\appframework
+
+ sdk\tier0
+
@@ -1721,9 +1721,6 @@
sdk\public\utility
-
- sdk\public\utility
-
sdk\game\shared
@@ -1772,6 +1769,9 @@
sdk\public\appframework
+
+ sdk\tier0
+
diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj
index 1a0f8965..83f6ad05 100644
--- a/r5dev/vproj/gamesdk.vcxproj
+++ b/r5dev/vproj/gamesdk.vcxproj
@@ -127,7 +127,6 @@
-
@@ -148,6 +147,7 @@
+
@@ -400,7 +400,6 @@
-
@@ -604,6 +603,7 @@
+
diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters
index 993ca819..8a938e1d 100644
--- a/r5dev/vproj/gamesdk.vcxproj.filters
+++ b/r5dev/vproj/gamesdk.vcxproj.filters
@@ -693,9 +693,6 @@
sdk\public\utility
-
- sdk\public\utility
-
sdk\game\server
@@ -747,6 +744,9 @@
sdk\public\appframework
+
+ sdk\tier0
+
@@ -2030,9 +2030,6 @@
sdk\public\utility
-
- sdk\public\utility
-
sdk\public
@@ -2165,6 +2162,9 @@
sdk\public\appframework
+
+ sdk\tier0
+