diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
| commit | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (patch) | |
| tree | c68db815a72cc767b6d51be0a57e9946c5f0a619 /src/CGALRenderer.cc | |
| parent | ba1f0b7489dd5fa9bdc8c44068040f13113b40d0 (diff) | |
| parent | 638743e2201c6869b48857dd2db5ec01df665162 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
tests/CMakeLists.txt
Diffstat (limited to 'src/CGALRenderer.cc')
| -rw-r--r-- | src/CGALRenderer.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/CGALRenderer.cc b/src/CGALRenderer.cc index 95bcba1..bac25a6 100644 --- a/src/CGALRenderer.cc +++ b/src/CGALRenderer.cc @@ -24,6 +24,11 @@ * */ +#ifdef _MSC_VER +// Boost conflicts with MPFR under MSVC (google it) +#include <mpfr.h> +#endif + // dxfdata.h must come first for Eigen SIMD alignment issues #include "dxfdata.h" #include "polyset.h" |