diff options
| author | glx <glx@openttd.org> | 2018-12-25 03:03:23 +0100 |
|---|---|---|
| committer | Patric Stout <truebrain@openttd.org> | 2018-12-26 17:29:11 +0100 |
| commit | 3be6ab555caf54222c7a43a188558ed6ec51e11a (patch) | |
| tree | f9667f498927e0ef4ef4aa8252d2d1b544b258ee /src/stdafx.h | |
| parent | cab39ff47fbca8964dbaf11d6168e0fa261454aa (diff) | |
| download | openttd-3be6ab555caf54222c7a43a188558ed6ec51e11a.tar.xz | |
Change: use vcpkg integration in Visual Studio
Removes the need for us to provide OpenTTD-useful package
Diffstat (limited to 'src/stdafx.h')
| -rw-r--r-- | src/stdafx.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/stdafx.h b/src/stdafx.h index 54709d151..fb384ca82 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -245,12 +245,19 @@ #define fseek _fseeki64 #endif /* _WIN64 || WIN64 */ - /* This is needed to zlib uses the stdcall calling convention on visual studio */ - #if defined(WITH_ZLIB) || defined(WITH_PNG) - #if !defined(ZLIB_WINAPI) - #define ZLIB_WINAPI - #endif - #endif + /* zlib from vcpkg use cdecl calling convention without enforcing it in the headers */ +# if defined(WITH_ZLIB) +# if !defined(ZEXPORT) +# define ZEXPORT CDECL +# endif +# endif + + /* freetype from vcpkg use cdecl calling convention without enforcing it in the headers */ +# if defined(WITH_FREETYPE) +# if !defined(FT_EXPORT) +# define FT_EXPORT( x ) extern "C" x CDECL +# endif +# endif #define strcasecmp stricmp #define strncasecmp strnicmp |