[Bf-blender-cvs] [5b325ab] master: [msvc2015/OpenEXR] Linker hackery is no longer required in vc2015
Martijn Berger
noreply at git.blender.org
Tue Jun 28 16:02:39 CEST 2016
Commit: 5b325abf604954fc7172dfa3e436dca15897ab65
Author: Martijn Berger
Date: Tue Jun 28 16:02:12 2016 +0200
Branches: master
https://developer.blender.org/rB5b325abf604954fc7172dfa3e436dca15897ab65
[msvc2015/OpenEXR] Linker hackery is no longer required in vc2015
Reviewers: juicyfruit
Reviewed By: juicyfruit
Differential Revision: https://developer.blender.org/D1892
===================================================================
M source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 611ada5..89e796f 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -77,7 +77,7 @@ extern "C"
{
// The following prevents a linking error in debug mode for MSVC using the libs in CVS
-#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(DEBUG) && !defined(__MINGW32__)
+#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(DEBUG) && !defined(__MINGW32__) && _MSC_VER < 1900
_CRTIMP void __cdecl _invalid_parameter_noinfo(void)
{
}
More information about the Bf-blender-cvs
mailing list