diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2020-08-02 16:35:20 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2020-08-02 16:35:20 +0300 |
| commit | b9845566b4b70222ea8e738cccb43cb5b7578759 (patch) | |
| tree | 285ef05797ea77aeb652252578bd34be371146a3 /source/blender/blenlib/BLI_mpq2.hh | |
| parent | 771da552bb4d56f551f576546ec2d1cbc1b863f7 (diff) | |
| parent | 4f27e94146fdde945f5b09c9e4efe38ca760635f (diff) | |
Merge branch 'master' into newboolean.
Also, make it possible to build when WITH_GMP is disabled.
Diffstat (limited to 'source/blender/blenlib/BLI_mpq2.hh')
| -rw-r--r-- | source/blender/blenlib/BLI_mpq2.hh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_mpq2.hh b/source/blender/blenlib/BLI_mpq2.hh index 771115ca041..a78ffaaa32d 100644 --- a/source/blender/blenlib/BLI_mpq2.hh +++ b/source/blender/blenlib/BLI_mpq2.hh @@ -17,8 +17,10 @@ #ifndef __BLI_MPQ2_HH__ #define __BLI_MPQ2_HH__ -#include "BLI_math_mpq.hh" -#include "BLI_mpq3.hh" +#ifdef WITH_GMP + +# include "BLI_math_mpq.hh" +# include "BLI_mpq3.hh" namespace blender { @@ -174,4 +176,5 @@ struct mpq2 { } // namespace blender +#endif /* WITH_GMP */ #endif /* __BLI_MPQ_HH__ */ |