diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-04-16 17:41:14 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-04-16 17:41:14 +0200 |
| commit | 45af97bff6d8227638acfaad501e0d8f97957d9b (patch) | |
| tree | e88cd1185b5b5c421a31c56cf770caadbbb420cd /EASTL | |
| parent | c727b5ceb06fcdc8dc141f8861baff14836f752f (diff) | |
EASTL integration
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'EASTL')
| -rw-r--r-- | EASTL/source/assert.cpp | 6 | ||||
| -rw-r--r-- | EASTL/source/thread_support.cpp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/EASTL/source/assert.cpp b/EASTL/source/assert.cpp index 7d32d5e..a4734af 100644 --- a/EASTL/source/assert.cpp +++ b/EASTL/source/assert.cpp @@ -15,7 +15,11 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif - #include <Windows.h> + #ifdef __MINGW64__ + #include <windows.h> + #else + #include <Windows.h> + #endif EA_RESTORE_ALL_VC_WARNINGS(); #elif defined(EA_PLATFORM_ANDROID) #include <android/log.h> diff --git a/EASTL/source/thread_support.cpp b/EASTL/source/thread_support.cpp index 1b03629..3b8550e 100644 --- a/EASTL/source/thread_support.cpp +++ b/EASTL/source/thread_support.cpp @@ -13,7 +13,11 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif - #include <Windows.h> + #ifdef __MINGW64__ + #include <windows.h> + #else + #include <Windows.h> + #endif EA_RESTORE_ALL_VC_WARNINGS(); #endif |