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 /source/blender/blenlib/BLI_math_base.h | |
| 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 'source/blender/blenlib/BLI_math_base.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index f7e6dc14295..14c1055cd3a 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -144,9 +144,13 @@ static const int NAN_INT = 0x7FC00000; #ifdef WIN32 # ifndef FREE_WINDOWS -# define isnan(n) _isnan(n) +# ifndef isnan +# define isnan(n) _isnan(n) +# endif # define finite _finite -# define hypot _hypot +# ifndef hypot +# define hypot(a, b) _hypot(a, b) +# endif # endif #endif |