CONFIG: incremental improvement for scotch + mingw

- linkage errors for ptscotch not yet solved

CONFIG: add -I. for ThirdParty wmake Make/options

- some <headers> might otherwise be missed with the change to
  '-iquote' for general wmake rules

etc/makeFiles/kahip/options

@@ -8,6 +8,7 @@ EXE_INC = \
     ${c++LESSWARN} \
     ${COMP_OPENMP} \
     -DNDEBUG -DMODE_NODESEP \
+    -I. \
     -I$(KAHIP_LIB_SRC) \
     -I$(KAHIP_LIB_SRC)/partition \
     -I$(KAHIP_LIB_SRC)/partition/uncoarsening/refinement/quotient_graph_refinement/flow_refinement

etc/makeFiles/libccmio/options

@@ -1,7 +1,5 @@
 /* NOTE: make any changes to this file in etc/makeFiles/ */
 
-EXE_INC =
-
+EXE_INC = -I.
 LIB_LIBS =
-
 PROJECT_LIBS =

etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib

@@ -10,7 +10,7 @@
 # - wmake -show-cflags        : with -m32 / -m64
 # - wmake -show-cflags-arch   : with -m32 / -m64
 #
-# Pass these in via the enviroment since using '$(shell ...)' here does not
+# Pass these in via the environment since using '$(shell ...)' here does not
 # always work well.
 #
 # Notes:

etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux-Mingw.shlib

@@ -10,7 +10,7 @@
 # - wmake -show-cflags        : with -m32 / -m64
 # - wmake -show-cflags-arch   : with -m32 / -m64
 #
-# Pass these in via the enviroment since using '$(shell ...)' here does not
+# Pass these in via the environment since using '$(shell ...)' here does not
 # always work well.
 #
 # Notes:
@@ -28,12 +28,17 @@ OBJ         = .o
 
 CFLAGS_CROSS = -DCOMMON_WINDOWS -DCOMMON_STUB_FORK
 
+# Flags for including windows MPI information (MSMPI)
+CFLAGS_WINMPI = -I$(MPI_ARCH_PATH)/include \
+    -DMSMPI_NO_SAL -DMSMPI_NO_DEPRECATE_20 \
+    -D_MPICH_DLL_
+
 AR          = x86_64-w64-mingw32-gcc
 ARFLAGS     = $(CFLAGS) -shared -Wl,--output-def,libscotch.def,--out-implib,libscotch.a,--enable-auto-import,--strip-all -o
 CC          = x86_64-w64-mingw32-gcc $(CFLAGS_CROSS)
-CCS         = x86_64-w64-mingw32-gcc
-CCP         = x86_64-w64-mingw32-gcc
-CCD         = gcc
+CCS         = x86_64-w64-mingw32-gcc $(CFLAGS_WINMPI)
+CCP         = x86_64-w64-mingw32-gcc $(CFLAGS_WINMPI)
+CCD         = gcc $(CFLAGS_WINMPI)
 CFLAGS      = $(WM_CFLAGS) -fPIC -O3 \
     -DCOMMON_PTHREAD_FILE \
     -UCOMMON_FILE_COMPRESS \
@@ -48,6 +53,10 @@ ifeq ($(WM_LABEL_SIZE),64)
 CFLAGS     += -DINTSIZE64
 endif
 
+# Non-standard "__stdcall" in MSMPI <mpi.h>
+CCDFLAGS    = $(CFLAGS) -D__stdcall=''
+
+
 CLIBFLAGS   = -shared
 LDFLAGS     =
 

etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib

@@ -10,7 +10,7 @@
 # - wmake -show-cflags        : with -m32 / -m64
 # - wmake -show-cflags-arch   : with -m32 / -m64
 #
-# Pass these in via the enviroment since using '$(shell ...)' here does not
+# Pass these in via the environment since using '$(shell ...)' here does not
 # always work well.
 #
 # Notes:

makeSCOTCH

@@ -211,9 +211,9 @@ then
         includedir="$incDIR" \
         install
 
-    rmdir "$binDIR" 2>/dev/null || true     # Remove empty bin/
+    rmdir "$binDIR" 2>/dev/null || true         # Remove empty bin/
     rmdir "${binDIR%/*}" 2>/dev/null || true    # ... and empty parent
-    make realclean 2>/dev/null || true      # Failed cleanup is uncritical
+    make realclean 2>/dev/null || true          # Failed cleanup is uncritical
 ) || warnBuildIssues SCOTCH
 else
     warnNotFound SCOTCH
@@ -222,11 +222,13 @@ fi
 
 # Build ptscotch when MPI (ThirdParty or system) is available
 
-[ "${withMPI}" = true ] || {
+if [ "${withMPI}" != true ]
+then
     # Report that the above tests failed and pass-through the failure
     echo "Skipping pt-scotch (no mpi)"
     exit 0
-}
+fi
+
 
 # Build ptscotch if normal scotch was built (has include and library)
 # (reuse prefix/include/lib dirs set above)
@@ -306,9 +308,9 @@ else
         includedir="$incDIR" \
         install
 
-    rmdir "$binDIR" 2>/dev/null || true     # Remove empty bin/
+    rmdir "$binDIR" 2>/dev/null || true         # Remove empty bin/
     rmdir "${binDIR%/*}" 2>/dev/null || true    # ... and empty parent
-    make realclean 2>/dev/null || true      # Failed cleanup is uncritical
+    make realclean 2>/dev/null || true          # Failed cleanup is uncritical
 ) || warnBuildIssues PTSCOTCH
 fi