diff options
| author | Alexandr Kuznetsov <kuzsasha@gmail.com> | 2013-11-29 23:50:59 +0400 |
|---|---|---|
| committer | Alexandr Kuznetsov <kuzsasha@gmail.com> | 2013-11-30 00:13:12 +0400 |
| commit | e2429d6492bb58a87bcbee29a0f78a6ea6bb6dfa (patch) | |
| tree | c8fd591ec86f46a00464a8500d6a523def190abf /intern/audaspace | |
| parent | cd4fd5056269858c6b85a9eec9929fecbe968695 (diff) | |
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.
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/intern/AUD_JOSResampleReader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 |