godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Appease capricious MSVC versions with moody headers 

Fixes #37799.
Fixes #37986.
This commit is contained in:
Rémi Verschelde 2020-04-26 22:27:04 +02:00
parent 5f645e5d84
commit 4d3a18d9ff
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/windows/crash_handler_windows.cpp
View File

@ -38,11 +38,13 @@
// Backtrace code code based on: https://stackoverflow.com/questions/6205981/windows-c-stack-trace-from-a-running-app // Backtrace code code based on: https://stackoverflow.com/questions/6205981/windows-c-stack-trace-from-a-running-app
#include <psapi.h>
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include <string>
#include <vector> #include <vector>
#include <psapi.h>
#pragma comment(lib, "psapi.lib") #pragma comment(lib, "psapi.lib")
#pragma comment(lib, "dbghelp.lib") #pragma comment(lib, "dbghelp.lib")

1
thirdparty/basis_universal/basisu_enc.h vendored
View File

@ -22,6 +22,7 @@
#include <functional> #include <functional>
#include <thread> #include <thread>
#include <unordered_map> #include <unordered_map>
#include <ostream>
#if !defined(_WIN32) || defined(__MINGW32__) #if !defined(_WIN32) || defined(__MINGW32__)
#include <libgen.h> #include <libgen.h>