diff options
author | Shauren <shauren.trinity@gmail.com> | 2024-09-15 12:13:54 +0200 |
---|---|---|
committer | Ovahlord <dreadkiller@gmx.de> | 2024-09-16 17:32:22 +0200 |
commit | b0b87aeea1a324af3a8c16be4b87bed05929de4e (patch) | |
tree | d1c2064310a7427d521014527ceff16e2a44363d /src/tools | |
parent | ec85afdbc7b37f68df8ce74c42649e82ac35b4c1 (diff) |
Core/CrashHandler: Compile WheatyExceptionReport only once and moved its global variable initializer to all projects using it
(cherry picked from commit fd0a7ba871060c895fdf701799dbf649ee697078)
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/map_extractor/System.cpp | 6 | ||||
-rw-r--r-- | src/tools/mmaps_generator/PathGenerator.cpp | 6 | ||||
-rw-r--r-- | src/tools/vmap4_assembler/VMapAssembler.cpp | 6 | ||||
-rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 6 |
4 files changed, 24 insertions, 0 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 13b72a5d38a..42b37f1a431 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -1570,3 +1570,9 @@ int main(int argc, char * arg[]) return 0; } + +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS +#include "WheatyExceptionReport.h" +// must be at end of file because of init_seg pragma +INIT_CRASH_HANDLER(); +#endif diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp index 4b9620bff1f..f3ba4ab48b6 100644 --- a/src/tools/mmaps_generator/PathGenerator.cpp +++ b/src/tools/mmaps_generator/PathGenerator.cpp @@ -458,3 +458,9 @@ int main(int argc, char** argv) printf("Finished. MMAPS were built in %s\n", secsToTimeString(GetMSTimeDiffToNow(start) / 1000).c_str()); return 0; } + +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS +#include "WheatyExceptionReport.h" +// must be at end of file because of init_seg pragma +INIT_CRASH_HANDLER(); +#endif diff --git a/src/tools/vmap4_assembler/VMapAssembler.cpp b/src/tools/vmap4_assembler/VMapAssembler.cpp index 444f748753c..5cdc214665e 100644 --- a/src/tools/vmap4_assembler/VMapAssembler.cpp +++ b/src/tools/vmap4_assembler/VMapAssembler.cpp @@ -111,3 +111,9 @@ Optional<int> HandleArgs(int argc, char* argv[], std::string* src, std::string* return {}; } + +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS +#include "WheatyExceptionReport.h" +// must be at end of file because of init_seg pragma +INIT_CRASH_HANDLER(); +#endif diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index f9903c7222b..229d7f38ba8 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -596,3 +596,9 @@ int main(int argc, char ** argv) printf("Extract %s. Work complete. No errors.\n", VMAP::VMAP_MAGIC); return 0; } + +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS +#include "WheatyExceptionReport.h" +// must be at end of file because of init_seg pragma +INIT_CRASH_HANDLER(); +#endif |