diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2016-10-17 21:47:33 -0700 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2016-10-17 21:47:33 -0700 |
| commit | 60f9734ad40e15af9399fc8e2d88285c9126f3a5 (patch) | |
| tree | 66d2deaa1a610c00e452ce908abcafb450303aec | |
| parent | bf8a95eade97eef668ff3aabf44fccd5dbbeaa5b (diff) | |
| download | sdl-60f9734ad40e15af9399fc8e2d88285c9126f3a5.tar.gz | |
Partial fix for bug 3092 - Statically link sdl2 with /MT for msvc
Mike Linford
I'm also having trouble statically linking SDL2 on Visual Studio 2015 with /MT. My symptom is that memcpy is being defined twice.
| -rw-r--r-- | src/stdlib/SDL_stdlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stdlib/SDL_stdlib.c b/src/stdlib/SDL_stdlib.c index 7f42a6f21..14ec5a923 100644 --- a/src/stdlib/SDL_stdlib.c +++ b/src/stdlib/SDL_stdlib.c @@ -279,7 +279,7 @@ __declspec(selectany) int _fltused = 1; #endif /* The optimizer on Visual Studio 2005 and later generates memcpy() calls */ -#if (_MSC_VER >= 1400) && defined(_WIN64) && !defined(_DEBUG) +#if (_MSC_VER >= 1400) && defined(_WIN64) && !defined(_DEBUG) && !(_MSC_VER >= 1900 && defined(_MT)) #include <intrin.h> #pragma function(memcpy) |