[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42403] trunk/blender/extern/libmv/libmv/ tracking/brute_region_tracker.cc: Fix MinGW compilation:
Antony Riakiotakis
kalast at gmail.com
Sun Dec 4 15:43:37 CET 2011
Revision: 42403
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42403
Author: psy-fi
Date: 2011-12-04 14:43:37 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Fix MinGW compilation:
define __MSVCRT_VERSION__ to 0x0700 (microsoft runtime msvcr70.dll) so _aligned_malloc is defined.
Modified Paths:
--------------
trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.cc
Modified: trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.cc 2011-12-04 14:42:21 UTC (rev 42402)
+++ trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.cc 2011-12-04 14:43:37 UTC (rev 42403)
@@ -26,6 +26,11 @@
#ifndef __APPLE__
// Needed for memalign on Linux and _aligned_alloc on Windows.
+#ifdef FREE_WINDOWS
+/* make sure _aligned_malloc is included */
+#define __MSVCRT_VERSION__ 0x0700
+#endif
+
#include <malloc.h>
#else
// Apple's malloc is 16-byte aligned, and does not have malloc.h, so include
More information about the Bf-blender-cvs
mailing list