diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-12 17:54:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 17:54:09 +0100 |
| commit | fb12d700c9f4f47c775fa1bebeeb40ff683b2ef2 (patch) | |
| tree | 68aa9f31e37c2e58e731ff373b4e81ba1afc60ed /thirdparty | |
| parent | 55962ce28fec5f06016ed3f66f52e6e84b817dbe (diff) | |
| parent | 5387613c7b954a4eb2743599031fe39635031893 (diff) | |
Merge pull request #14595 from hpvb/fix-mingw-build
Fix mingw build for thekla_atlas
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/thekla_atlas/nvcore/Debug.cpp | 18 | ||||
| -rw-r--r-- | thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/thirdparty/thekla_atlas/nvcore/Debug.cpp b/thirdparty/thekla_atlas/nvcore/Debug.cpp index 75ac6beb75..113c551de8 100644 --- a/thirdparty/thekla_atlas/nvcore/Debug.cpp +++ b/thirdparty/thekla_atlas/nvcore/Debug.cpp @@ -14,17 +14,15 @@ # define VC_EXTRALEAN # include <windows.h> # include <direct.h> -# if NV_CC_MSVC -# include <crtdbg.h> -# if _MSC_VER < 1300 -# define DECLSPEC_DEPRECATED +# include <crtdbg.h> +# if _MSC_VER < 1300 +# define DECLSPEC_DEPRECATED // VC6: change this path to your Platform SDK headers -# include <dbghelp.h> // must be XP version of file -// include "M:\\dev7\\vs\\devtools\\common\\win32sdk\\include\\dbghelp.h" -# else +# include <dbghelp.h> // must be XP version of file +// include "M:\\dev7\\vs\\devtools\\common\\win32sdk\\include\\dbghelp.h" +# else // VC7: ships with updated headers -# include <dbghelp.h> -# endif +# include <dbghelp.h> # endif # pragma comment(lib,"dbghelp.lib") #endif @@ -110,7 +108,7 @@ namespace #endif -#if (NV_OS_WIN32 && NV_CC_MSVC) || NV_OS_DURANGO +#if NV_OS_WIN32 || NV_OS_DURANGO // 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 f35ed88575..4f97b90f3a 100644 --- a/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h +++ b/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h @@ -19,7 +19,7 @@ #endif #define NV_FASTCALL __attribute__((fastcall)) -#define NV_FORCEINLINE __attribute__((always_inline)) +#define NV_FORCEINLINE __attribute__((always_inline)) inline #define NV_DEPRECATED __attribute__((deprecated)) #if __GNUC__ > 2 |