diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-11 16:32:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 16:32:26 +0100 |
| commit | 8c73e813134001e575b6f59e3b0100471c007410 (patch) | |
| tree | a8d1eb124d2329a6b1c83e2d76a3a60e8d48d606 /thirdparty/rvo2/src/API.h | |
| parent | 1eb424ec9549bdd086dfb54c847d107519be73d9 (diff) | |
| parent | d544baf174bd3f7f1e86aef7c11654292cec4018 (diff) | |
Merge pull request #36102 from bruvzg/rvo2_mingw_fix
[MinGW] Remove unused WinAPI includes/defines from RVO2.
Diffstat (limited to 'thirdparty/rvo2/src/API.h')
| -rw-r--r-- | thirdparty/rvo2/src/API.h | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/thirdparty/rvo2/src/API.h b/thirdparty/rvo2/src/API.h index c63a5a383c..c64efb452c 100644 --- a/thirdparty/rvo2/src/API.h +++ b/thirdparty/rvo2/src/API.h @@ -38,34 +38,8 @@ #ifndef RVO_API_H_ #define RVO_API_H_ -#ifdef _WIN32 -#include <SDKDDKVer.h> -#define WIN32_LEAN_AND_MEAN -#define NOCOMM -#define NOIMAGE -#define NOIME -#define NOKANJI -#define NOMCX -#ifndef NOMINMAX -#define NOMINMAX -#endif -#define NOPROXYSTUB -#define NOSERVICE -#define NOSOUND -#define NOTAPE -#define NORPC -#define _USE_MATH_DEFINES -#include <windows.h> -#undef CONNECT_DEFERRED // Avoid collision with the Godot Object class -#undef CreateDialog // Avoid collision with the Godot CreateDialog class -#endif - -#ifdef RVO_EXPORTS -#define RVO_API __declspec(dllexport) -#elif defined(RVO_IMPORTS) -#define RVO_API __declspec(dllimport) -#else +// -- GODOT start -- #define RVO_API -#endif +// -- GODOT end -- #endif /* RVO_API_H_ */ |