diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-15 09:21:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 09:21:35 +0100 |
| commit | e75da0a4402e53373c66f9bf99e8e8ba6f0ee5b2 (patch) | |
| tree | bf1eac165a8c2e6c488a0bbdc1724c666a38e168 /thirdparty/thekla_atlas/nvcore | |
| parent | c0beab6c5b85d4327b6da4870cd686cbb9920b04 (diff) | |
| parent | f55162ac1d8457a806b61880dc9ce424ec47fefb (diff) | |
Merge pull request #14690 from bruvzg/thekla-mingw-build-fix
Fixes thekla atlas mingw-w64 build.
Diffstat (limited to 'thirdparty/thekla_atlas/nvcore')
| -rw-r--r-- | thirdparty/thekla_atlas/nvcore/Debug.cpp | 5 | ||||
| -rw-r--r-- | thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/thirdparty/thekla_atlas/nvcore/Debug.cpp b/thirdparty/thekla_atlas/nvcore/Debug.cpp index 113c551de8..81498c219e 100644 --- a/thirdparty/thekla_atlas/nvcore/Debug.cpp +++ b/thirdparty/thekla_atlas/nvcore/Debug.cpp @@ -14,6 +14,7 @@ # define VC_EXTRALEAN # include <windows.h> # include <direct.h> +// -- GODOT start - # include <crtdbg.h> # if _MSC_VER < 1300 # define DECLSPEC_DEPRECATED @@ -24,6 +25,7 @@ // VC7: ships with updated headers # include <dbghelp.h> # endif +// -- GODOT end - # pragma comment(lib,"dbghelp.lib") #endif @@ -107,8 +109,9 @@ namespace #endif - +// -- GODOT start - #if NV_OS_WIN32 || NV_OS_DURANGO +// -- GODOT end - // We should try to simplify the top level filter as much as possible. // http://www.nynaeve.net/?p=128 diff --git a/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h b/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h index 4f97b90f3a..e1c8d6e4f8 100644 --- a/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h +++ b/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h @@ -19,7 +19,9 @@ #endif #define NV_FASTCALL __attribute__((fastcall)) +// -- GODOT start - #define NV_FORCEINLINE __attribute__((always_inline)) inline +// -- GODOT end - #define NV_DEPRECATED __attribute__((deprecated)) #if __GNUC__ > 2 |