diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-11-11 12:04:28 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-11-11 12:04:28 -0800 |
| commit | db8992ae795e9d909e0896507e9f600950af89bc (patch) | |
| tree | 5be6297eba077397410e2be648b325695bf10c6f /cmake | |
| parent | 066309bebf4cdc7fabbbdb05f13dab0e4cf40ef0 (diff) | |
| parent | 7b0dfd802aa08c4d0aefde2df0361304d8f282f4 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 7 | ||||
| -rw-r--r-- | cmake/msvc/config.h | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index 6e036a5bdc..1cf8e65a11 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -32,14 +32,9 @@ set(BOOST_REQUIRED_COMPONENTS filesystem system regex + thread ) -if (MINGW) - set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} thread_win32) -else(MINGW) - set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} thread) -endif(MINGW) - if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") diff --git a/cmake/msvc/config.h b/cmake/msvc/config.h index 99a2ea0f89..d3daed1587 100644 --- a/cmake/msvc/config.h +++ b/cmake/msvc/config.h @@ -21,7 +21,6 @@ typedef ptrdiff_t ssize_t; //////////////////////////////////////////////////////////////////////// // rint functions //////////////////////////////////////////////////////////////////////// -#define _USE_MATH_DEFINES #include <math.h> #if _MSC_VER < 1800 static inline long lrint(double x){return (long)(x > 0.0 ? x + 0.5 : x - 0.5);} @@ -62,7 +61,4 @@ static inline float rintf(float x){return (x > 0.0f)? floorf(x + 0.5f) : ceilf(x static inline long int random (void) { return rand(); } static inline void srandom (unsigned int seed) { srand(seed); } -#define srand48(seed) srand(seed) -#define drand48() (double(rand()) / RAND_MAX) - #endif // _MSC_CONFIG_H_ ] |