From 67f828d299b0ee5d90f89e5c9903fe2fe92bdfc1 Mon Sep 17 00:00:00 2001
From: graham <graham.macpherson@strath.ac.uk>
Date: Mon, 30 Mar 2009 17:00:28 +0100
Subject: [PATCH] Changed to gcc 4.3.3, linking mpfr from ThirdParty to
CV3DMesher.
---
.../utilities/mesh/generation/CV3DMesher/Make/options | 7 +++++--
wmake/rules/General/CGAL | 3 +--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/applications/utilities/mesh/generation/CV3DMesher/Make/options b/applications/utilities/mesh/generation/CV3DMesher/Make/options
index b72bd2a65e0..d58ae360fd7 100644
--- a/applications/utilities/mesh/generation/CV3DMesher/Make/options
+++ b/applications/utilities/mesh/generation/CV3DMesher/Make/options
@@ -9,14 +9,17 @@ EXE_INC = \
${EXE_FROUNDING_MATH} \
${EXE_NDEBUG} \
${CGAL_INC} \
+ -I$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1 \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude
EXE_LIBS = \
- -L$(BOOST_SRC)/lib \
+ -L$(BOOST_ROOT)/lib \
+ -L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
-lmeshTools \
-ltriSurface \
-ldynamicMesh \
- -lboost_thread-gcc43-mt-1_38
+ -lboost_thread-gcc43-mt-1_38 \
+ -lmpfr
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 4e7e3b4ef95..dac5f5f6e28 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -3,5 +3,4 @@ CGAL_PATH = ${WM_THIRD_PARTY_DIR}/CGAL-${CGAL_VERSION}
CGAL_INC = \
-Wno-old-style-cast \
-I${CGAL_SRC}/include \
- -I${CGAL_PATH} \
- -I${BOOST_SRC}
+ -I${CGAL_PATH}
\ No newline at end of file
--
GitLab