Rectified dependencies in the 'foamyHexMesh' stack and revised the 'CGAL' file for 'mingw_w64Gcc'.

Author: wyldckat

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options

@@ -7,8 +7,6 @@ CGAL_INEXACT = -DCGAL_INEXACT
 include $(GENERAL_RULES)/CGAL
 sinclude $(RULES)/CGAL
 
-#if ! (defined( WIN32 ) || defined( WIN64 ))
-
 EXE_INC = \
     ${ROUNDING_MATH} \
     ${EXE_NDEBUG} \
@@ -37,42 +35,6 @@ LIB_LIBS = \
     -lsampling \
     -lsnappyHexMesh
 
-#else
-
-EXE_INC = \
-    ${EXE_FROUNDING_MATH} \
-    ${EXE_NDEBUG} \
-    ${CGAL_EXACT} \
-    ${CGAL_INEXACT} \
-    ${CGAL_INC} \
-    ${c++CGALWARN} \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
-    -IPrintTable \
-    -I../vectorTools
-
-LIB_LIBS = \
-    ${CGAL_LIBS} \
-    -lgmp \
+LIB_LIBS += \
     -lfiniteVolume \
-    -ldecompositionMethods \
-    -lmeshTools \
-    -ledgeMesh \
-    -lfileFormats \
-    -ltriSurface \
-    -ldynamicMesh \
-    -lsurfMesh \
-    -lsampling \
-    -lsnappyHexMesh \
-    -lboost_thread-mt \
-    -lboost_system-mt
-
-#endif
+    -ldecompositionMethods

applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options

@@ -36,7 +36,5 @@ EXE_LIBS = \
     -ldynamicMesh \
     -lsampling
 
-#if defined( WIN32 ) || defined( WIN64 )
 EXE_LIBS += \
-    -lboost_system-mt
-#endif
+    -lfiniteVolume

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options

@@ -4,8 +4,6 @@ EXE_NDEBUG = -DNDEBUG
 include $(GENERAL_RULES)/CGAL
 sinclude $(RULES)/CGAL
 
-#if ! (defined( WIN32 ) || defined( WIN64 ))
-
 EXE_INC = \
     ${ROUNDING_MATH} \
     ${EXE_NDEBUG} \
@@ -39,46 +37,3 @@ EXE_LIBS = \
     -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \
     -lsampling \
     -lfileFormats
-
-#else
-
-EXE_INC = \
-    ${EXE_FROUNDING_MATH} \
-    ${EXE_NDEBUG} \
-    ${CGAL_INC} \
-    ${c++CGALWARN} \
-    -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
-    -I../conformalVoronoi2DMesh/lnInclude \
-    -I../conformalVoronoiMesh/lnInclude \
-    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude
-
-EXE_LIBS = \
-    $(CGAL_LIBS) \
-    -lgmp \
-    -lextrude2DMesh \
-    -lextrudeModel \
-    -lcv2DMesh \
-    -lconformalVoronoiMesh \
-    -lmeshTools \
-    -lsurfMesh \
-    -ledgeMesh \
-    -ltriSurface \
-    -ldynamicMesh \
-    -ldecompositionMethods \
-    -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \
-    -lsampling \
-    -lfileFormats \
-    -lboost_thread-mt \
-    -lboost_system-mt
-
-#endif

wmake/rules/mingw_w64Gcc/CGAL

@@ -6,4 +6,7 @@ CGAL_LIBS = \
     -L$(BOOST_ARCH_PATH)/lib \
     -L$(CGAL_ARCH_PATH)/lib \
     -lCGAL \
-    -lmpfr
+    -lmpfr \
+    -lgmp \
+    -lboost_thread-mt \
+    -lboost_system-mt