forked from bartvdbraak/blender
patch from Jochen Schmitt to get blender building with gcc4.7
This commit is contained in:
parent
fd60de606a
commit
1f3df9e659
@ -1490,10 +1490,9 @@ if(MSVC10)
|
||||
endif()
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
if(WITH_IK_ITASC OR WITH_MOD_FLUID)
|
||||
if(WITH_IK_ITASC)
|
||||
message(WARNING "Using Clang as CXX compiler: disabling WITH_IK_ITASC and WITH_MOD_FLUID, these features will be missing.")
|
||||
set(WITH_IK_ITASC OFF)
|
||||
set(WITH_MOD_FLUID OFF)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
@ -27,6 +27,12 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
/* absolute value */
|
||||
template < class T >
|
||||
inline T
|
||||
ABS( T a )
|
||||
{ return (0 < a) ? a : -a ; }
|
||||
|
||||
// hack for MSVC6.0 compiler
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER < 1300
|
||||
|
@ -177,12 +177,6 @@ inline T
|
||||
MAX( T a, T b )
|
||||
{ return (a < b) ? b : a ; }
|
||||
|
||||
/* absolute value */
|
||||
template < class T >
|
||||
inline T
|
||||
ABS( T a )
|
||||
{ return (0 < a) ? a : -a ; }
|
||||
|
||||
/* sign of the value */
|
||||
template < class T >
|
||||
inline T
|
||||
|
Loading…
Reference in New Issue
Block a user