COMP: fix some linkage issues for mingw

COMP: automatically add FlexLexer.h to MSwindows OSspecific

- useful, frequently forgotten step for cross-compiling

applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options

@@ -3,4 +3,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
+    -lfiniteVolume \
     -lmultiphaseSystem

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options

@@ -10,6 +10,8 @@ EXE_INC = \
     -I../twoPhaseSystem/lnInclude
 
 LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
     -lcompressibleTwoPhaseSystem \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \

applications/utilities/mesh/generation/blockMesh/Make/options

@@ -6,5 +6,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lblockMesh \
+    -lfileFormats \
     -lmeshTools \
     -ldynamicMesh

applications/utilities/preProcessing/PDRsetFields/pdrFields/Make/options

@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/mesh/blockMesh/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lfiniteVolume \
     -lfileFormats \
     -lsurfMesh \

applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysAnalyse.C

@@ -38,8 +38,10 @@ License
 #include <cstring>
 
 #ifndef FULLDEBUG
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 #include <cassert>
 
 using namespace Foam;

applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRarraysCalc.C

@@ -46,8 +46,10 @@ License
 #include "OSspecific.H"
 
 #ifndef FULLDEBUG
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 #include <cassert>
 
 using namespace Foam;

applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsIntersect.C

@@ -31,8 +31,10 @@ License
 #include "mathematicalConstants.H"
 
 #ifndef FULLDEBUG
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 #include <cassert>
 
 using namespace Foam::constant;

applications/utilities/preProcessing/PDRsetFields/pdrFields/PDRutilsOverlap.C

@@ -31,8 +31,10 @@ License
 #include "mathematicalConstants.H"
 
 #ifndef FULLDEBUG
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 #include <cassert>
 
 using namespace Foam::constant;

src/OSspecific/MSwindows/Allwmake

@@ -4,6 +4,18 @@ targetType=libo                                     # Preferred library type
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments $*
 
 #------------------------------------------------------------------------------
+
+if [ -f /usr/include/FlexLexer.h ] && [ ! -f FlexLexer.h ]
+then
+    echo "Adding FlexLexer.h link to ${PWD##*/} for cross-compilation"
+    ln -sf /usr/include/FlexLexer.h FlexLexer.h
+
+    if [ -d lnInclude ]
+    then
+        (cd lnInclude && ln -sf ../FlexLexer.h .)
+    fi
+fi
+
 unset COMP_FLAGS LINK_FLAGS
 
 # Make object (non-shared by default)

src/transportModels/geometricVoF/Make/options

@@ -3,15 +3,17 @@ EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
     -lfileFormats \
     -lsurfMesh \
     -lmeshTools \
+    -lsampling \
+    -ldynamicMesh \
     -ltwoPhaseMixture \
     -ltwoPhaseProperties