From f074d238d3a1feca76ae7a437c344350ea45c5ce Mon Sep 17 00:00:00 2001
From: unknown <thery@.(none)>
Date: Tue, 20 Sep 2011 10:00:49 +0200
Subject: [PATCH] pb compilation windows (boost/M_PI/abs ..)

---
 Apps/Examples/Debug/CMakeLists.txt         | 6 ++++++
 Apps/Examples/Release/CMakeLists.txt       | 3 ++-
 Apps/Tuto/CMakeLists.txt                   | 2 +-
 src/Algo/ImplicitHierarchicalMesh/ihm3.cpp | 2 +-
 src/Utils/clippingPresets.cpp              | 3 +++
 src/Utils/clippingPresetsAnimated.cpp      | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Apps/Examples/Debug/CMakeLists.txt b/Apps/Examples/Debug/CMakeLists.txt
index 8268efc0..cd6bef2e 100644
--- a/Apps/Examples/Debug/CMakeLists.txt
+++ b/Apps/Examples/Debug/CMakeLists.txt
@@ -30,6 +30,12 @@ link_directories(
 	${CGoGN_ROOT_DIR}/lib/Debug
 	${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
 
diff --git a/Apps/Examples/Release/CMakeLists.txt b/Apps/Examples/Release/CMakeLists.txt
index 412ebc6a..46f13fed 100644
--- a/Apps/Examples/Release/CMakeLists.txt
+++ b/Apps/Examples/Release/CMakeLists.txt
@@ -27,11 +27,12 @@ include_directories(
 	${CGoGN_ROOT_DIR}/ThirdParty/OpenCTM
 	${CGoGN_ROOT_DIR}/ThirdParty/Assimp/include
 	${CGoGN_ROOT_DIR}/ThirdParty/glm
+	${Boost_INCLUDE_DIRS}
 )
 
 # define libs path
 IF(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) )
+	link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)  ${Boost_LIBRARY_DIRS})
 ELSE(WIN32)
 	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
 ENDIF(WIN32)
diff --git a/Apps/Tuto/CMakeLists.txt b/Apps/Tuto/CMakeLists.txt
index e7cbd361..60c4e3d4 100644
--- a/Apps/Tuto/CMakeLists.txt
+++ b/Apps/Tuto/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories(
 
 # define libs path
 IF(WIN32)
-	link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName))
+	link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS})
 ELSE(WIN32)
 	link_directories(${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Debug)
 ENDIF(WIN32)
diff --git a/src/Algo/ImplicitHierarchicalMesh/ihm3.cpp b/src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
index 10944fbf..2ceae223 100644
--- a/src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
+++ b/src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
@@ -541,7 +541,7 @@ bool ImplicitHierarchicalMap3::neighborhoodLevelDiffersByOne(Dart d)
 		{
 			// 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;
 			}
diff --git a/src/Utils/clippingPresets.cpp b/src/Utils/clippingPresets.cpp
index 3f11eb7a..7805e79f 100644
--- a/src/Utils/clippingPresets.cpp
+++ b/src/Utils/clippingPresets.cpp
@@ -24,6 +24,9 @@
 
 #include "Utils/clippingPresets.h"
 
+#define _USE_MATH_DEFINES
+#include <math.h>
+
 namespace CGoGN
 {
 
diff --git a/src/Utils/clippingPresetsAnimated.cpp b/src/Utils/clippingPresetsAnimated.cpp
index eb0044b9..f52ea503 100644
--- a/src/Utils/clippingPresetsAnimated.cpp
+++ b/src/Utils/clippingPresetsAnimated.cpp
@@ -23,6 +23,8 @@
 *******************************************************************************/
 
 #include "Utils/clippingPresetsAnimated.h"
+#define _USE_MATH_DEFINES
+#include <math.h>
 
 namespace CGoGN
 {
-- 
GitLab