diff options
author | Jacques Beuarain <jacques.beaurain@gmail.com> | 2006-11-18 05:48:18 +0300 |
---|---|---|
committer | Jacques Beuarain <jacques.beaurain@gmail.com> | 2006-11-18 05:48:18 +0300 |
commit | 2a0fc46266de4baeadadd8114a1cc70faf78ea6c (patch) | |
tree | 5b9940ca3a9b72e40b87ce871e2209269d64c858 /source/blender/imbuf/intern/openexr/openexr_api.cpp | |
parent | 6e4b94ff511c15e301c045149e51f0ecbbe50a49 (diff) |
CMake: Fix FFMPeg/OpenEXR issues in CMake system and possibly the others. OpenEXR can be linked in DEBUG mode on Windows using the libraries in CVS and stub.
Diffstat (limited to 'source/blender/imbuf/intern/openexr/openexr_api.cpp')
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 01e6c6b3fb7..3027f9508cf 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -35,6 +35,14 @@ extern "C" { + +// The following prevents a linking error in debug mode for MSVC using the libs in CVS +#if defined(_WIN32) && defined(_DEBUG) && !defined(__MINGW32__) && !defined(__CYGWIN__) +_CRTIMP void __cdecl _invalid_parameter_noinfo(void) +{ +} +#endif + #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" |