Commit f074d238 authored by unknown's avatar unknown

pb compilation windows (boost/M_PI/abs ..)

parent b6da7331
...@@ -30,6 +30,12 @@ link_directories( ...@@ -30,6 +30,12 @@ link_directories(
${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Debug
${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Release
) )
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS})
ELSE(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF(WIN32)
#define exec to compile #define exec to compile
......
...@@ -27,11 +27,12 @@ include_directories( ...@@ -27,11 +27,12 @@ include_directories(
${CGoGN_ROOT_DIR}/ThirdParty/OpenCTM ${CGoGN_ROOT_DIR}/ThirdParty/OpenCTM
${CGoGN_ROOT_DIR}/ThirdParty/Assimp/include ${CGoGN_ROOT_DIR}/ThirdParty/Assimp/include
${CGoGN_ROOT_DIR}/ThirdParty/glm ${CGoGN_ROOT_DIR}/ThirdParty/glm
${Boost_INCLUDE_DIRS}
) )
# define libs path # define libs path
IF(WIN32) IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ) link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS})
ELSE(WIN32) ELSE(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release ) link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF(WIN32) ENDIF(WIN32)
......
...@@ -26,7 +26,7 @@ include_directories( ...@@ -26,7 +26,7 @@ include_directories(
# define libs path # define libs path
IF(WIN32) IF(WIN32)
link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)) link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS})
ELSE(WIN32) ELSE(WIN32)
link_directories(${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Debug) link_directories(${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Debug)
ENDIF(WIN32) ENDIF(WIN32)
......
...@@ -541,7 +541,7 @@ bool ImplicitHierarchicalMap3::neighborhoodLevelDiffersByOne(Dart d) ...@@ -541,7 +541,7 @@ bool ImplicitHierarchicalMap3::neighborhoodLevelDiffersByOne(Dart d)
{ {
// add all face neighbours to the table // add all face neighbours to the table
if(phi3(e) != e && (abs(volumeLevel(phi3(e)) - vLevel) > 1)) if(phi3(e) != e && (abs(int(volumeLevel(phi3(e)) - vLevel)) > 1))
{ {
found = true; found = true;
} }
......
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
#include "Utils/clippingPresets.h" #include "Utils/clippingPresets.h"
#define _USE_MATH_DEFINES
#include <math.h>
namespace CGoGN namespace CGoGN
{ {
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
*******************************************************************************/ *******************************************************************************/
#include "Utils/clippingPresetsAnimated.h" #include "Utils/clippingPresetsAnimated.h"
#define _USE_MATH_DEFINES
#include <math.h>
namespace CGoGN namespace CGoGN
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment