From e2429d6492bb58a87bcbee29a0f78a6ea6bb6dfa Mon Sep 17 00:00:00 2001
From: Alexandr Kuznetsov <kuzsasha@gmail.com>
Date: Fri, 29 Nov 2013 14:50:59 -0500
Subject: Woo Hoo. First git commit.

Changes for VC2013

Now, I can build Blender with VC2013 with Cycles, Collada, OpenExr,OpenImageIO disabled. Also, you need VC2008 sp1 installed to make old libs compatible.
---
 intern/audaspace/intern/AUD_JOSResampleReader.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'intern/audaspace')

diff --git a/intern/audaspace/intern/AUD_JOSResampleReader.cpp b/intern/audaspace/intern/AUD_JOSResampleReader.cpp
index 87577da95cc..0448c75d777 100644
--- a/intern/audaspace/intern/AUD_JOSResampleReader.cpp
+++ b/intern/audaspace/intern/AUD_JOSResampleReader.cpp
@@ -36,6 +36,7 @@
 
 /* MSVC does not have lrint */
 #ifdef _MSC_VER
+#if _MSC_VER < 1800  
 #ifdef _M_X64
 #include <emmintrin.h>
 static inline int lrint(double d)
@@ -56,6 +57,7 @@ static inline int lrint(double d)
 }
 #endif
 #endif
+#endif
 
 // UNUSED
 // #define CC m_channels + channel
-- 
cgit v1.2.3