diff -Naur OpenFOAM-1.3.CaseInsensitive/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C OpenFOAM-1.3/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C --- OpenFOAM-1.3.CaseInsensitive/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C 2006-01-10 08:52:59.000000000 -0800 +++ OpenFOAM-1.3/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C 2006-04-04 14:56:23.000000000 -0700 @@ -35,6 +35,10 @@ #include #endif +#ifdef cygwin +#include +#endif + // MacOSX #ifdef __DARWIN_BYTE_ORDER #if __DARWIN_BYTE_ORDER==__DARWIN_BIG_ENDIAN diff -Naur OpenFOAM-1.3.CaseInsensitive/src/OpenFOAM/db/error/error.C OpenFOAM-1.3/src/OpenFOAM/db/error/error.C --- OpenFOAM-1.3.CaseInsensitive/src/OpenFOAM/db/error/error.C 2006-02-24 08:56:39.000000000 -0800 +++ OpenFOAM-1.3/src/OpenFOAM/db/error/error.C 2006-04-04 14:56:23.000000000 -0700 @@ -36,10 +36,12 @@ #include "OSspecific.H" #if defined(__GNUC__) +#ifndef cygwin #include "IStringStream.H" #include #include #endif +#endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -163,6 +165,7 @@ void error::printStack(Ostream& os) { #if defined(__GNUC__) +#ifndef cygwin // Get raw stack symbols void *array[100]; @@ -229,6 +232,7 @@ free(strings); #endif +#endif } diff -Naur OpenFOAM-1.3.CaseInsensitive/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C OpenFOAM-1.3/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C --- OpenFOAM-1.3.CaseInsensitive/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C 2005-10-19 06:32:54.000000000 -0700 +++ OpenFOAM-1.3/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C 2006-04-04 14:56:37.000000000 -0700 @@ -26,6 +26,7 @@ \*---------------------------------------------------------------------------*/ +#include "octreeDataTriSurfaceTreeLeaf.H" #include "octreeDataTriSurface.H" #include "labelList.H" diff -Naur OpenFOAM-1.3.CaseInsensitive/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C OpenFOAM-1.3/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C --- OpenFOAM-1.3.CaseInsensitive/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C 2005-06-21 09:06:19.000000000 -0700 +++ OpenFOAM-1.3/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C 2006-04-04 14:56:37.000000000 -0700 @@ -26,6 +26,7 @@ \*---------------------------------------------------------------------------*/ +#include "octreeDataTriSurfaceTreeLeaf.H" #include "triSurfaceSearch.H" #include "octree.H" #include "boolList.H" diff -Naur OpenFOAM-1.3.CaseInsensitive/src/lagrangian/dieselSpray/parcel/parcel.H OpenFOAM-1.3/src/lagrangian/dieselSpray/parcel/parcel.H --- OpenFOAM-1.3.CaseInsensitive/src/lagrangian/dieselSpray/parcel/parcel.H 2006-03-28 13:21:39.000000000 -0800 +++ OpenFOAM-1.3/src/lagrangian/dieselSpray/parcel/parcel.H 2006-04-04 14:56:35.000000000 -0700 @@ -401,6 +401,14 @@ return true; } +// Parcel I/O functions in parcelIO.C (needed for Cygwin). + +template<> +void Cloud::readFields(); + +template<> +void Cloud::writeFields() const; + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff -Naur OpenFOAM-1.3.CaseInsensitive/src/lagrangian/dieselSpray/spray/spray.C OpenFOAM-1.3/src/lagrangian/dieselSpray/spray/spray.C --- OpenFOAM-1.3.CaseInsensitive/src/lagrangian/dieselSpray/spray/spray.C 2006-03-28 13:21:39.000000000 -0800 +++ OpenFOAM-1.3/src/lagrangian/dieselSpray/spray/spray.C 2006-04-04 14:56:35.000000000 -0700 @@ -25,6 +25,7 @@ \*---------------------------------------------------------------------------*/ #include "spray.H" +#include "parcel.H" #include "atomizationModel.H" #include "breakupModel.H" diff -Naur OpenFOAM-1.3.CaseInsensitive/src/malloc/fbsdmalloc/fbsdmalloc.c OpenFOAM-1.3/src/malloc/fbsdmalloc/fbsdmalloc.c --- OpenFOAM-1.3.CaseInsensitive/src/malloc/fbsdmalloc/fbsdmalloc.c 2001-09-19 02:31:46.000000000 -0700 +++ OpenFOAM-1.3/src/malloc/fbsdmalloc/fbsdmalloc.c 2006-04-04 14:56:35.000000000 -0700 @@ -861,10 +861,13 @@ memset(ptr, SOME_JUNK, l); # ifndef linux +# ifndef cygwin /***HGW this was #ifed by me because linux does not support madvise */ + /***BM: cygwin also complains here; MADV_FREE=MADV_DONTNEED=undefined */ if (malloc_hint) madvise(ptr, l, MADV_FREE); # endif +# endif tail = (char *)ptr+l; diff -Naur OpenFOAM-1.3.CaseInsensitive/applications/utilities/mesh/manipulation/Allwmake OpenFOAM-1.3/applications/utilities/mesh/manipulation/Allwmake --- OpenFOAM-1.3.CaseInsensitive/applications/utilities/mesh/manipulation/Allwmake 2006-01-17 10:17:05.000000000 -0800 +++ OpenFOAM-1.3/applications/utilities/mesh/manipulation/Allwmake 2006-04-04 14:56:22.000000000 -0700 @@ -30,4 +30,7 @@ wmake faceSet wmake pointSet -(cd patchTool; ./Allwmake) +if [ -r $MICO_ARCH_PATH/lib/libmico${MICO_VERSION}.a ] +then + (cd patchTool; ./Allwmake) +fi diff -Naur OpenFOAM-1.3.CaseInsensitive/applications/utilities/miscellaneous/Allwmake OpenFOAM-1.3/applications/utilities/miscellaneous/Allwmake --- OpenFOAM-1.3.CaseInsensitive/applications/utilities/miscellaneous/Allwmake 2004-11-24 14:06:37.000000000 -0800 +++ OpenFOAM-1.3/applications/utilities/miscellaneous/Allwmake 2006-04-04 14:56:23.000000000 -0700 @@ -2,5 +2,9 @@ set -x -wmake foamDebugSwitches +if [ -r $FOAM_LIBBIN/libFoamX.a ] +then + wmake foamDebugSwitches +fi + wmake foamInfoExec diff -Naur OpenFOAM-1.3.CaseInsensitive/applications/utilities/preProcessing/Allwmake OpenFOAM-1.3/applications/utilities/preProcessing/Allwmake --- OpenFOAM-1.3.CaseInsensitive/applications/utilities/preProcessing/Allwmake 2005-04-08 10:02:48.000000000 -0700 +++ OpenFOAM-1.3/applications/utilities/preProcessing/Allwmake 2006-04-04 14:56:23.000000000 -0700 @@ -2,7 +2,10 @@ set -x -(cd FoamX ; ./Allwmake) +if [ -r $MICO_ARCH_PATH/lib/libmico${MICO_VERSION}.a ] +then + (cd FoamX ; ./Allwmake) +fi wmake setFields wmake mapFields diff -Naur OpenFOAM-1.3.CaseInsensitive/src/Allwmake OpenFOAM-1.3/src/Allwmake --- OpenFOAM-1.3.CaseInsensitive/src/Allwmake 2006-02-28 09:08:48.000000000 -0800 +++ OpenFOAM-1.3/src/Allwmake 2006-04-07 15:47:09.000000000 -0700 @@ -108,8 +108,14 @@ cp foamFlex/FlexLexer.h $FOAM_SRC/OpenFOAM/lnInclude cd $FOAM_SRC -(cd Pstream ; ./Allwmake) -wmake libso OpenFOAM +if [ "$WM_ARCH" = "cygwin" ] +then + wmake libso OpenFOAM + (cd Pstream ; ./Allwmake) +else + (cd Pstream ; ./Allwmake) + wmake libso OpenFOAM +fi wmake libso lagrangian/basic @@ -148,7 +154,7 @@ (cd malloc ; ./Allwmake) -if [ ! -r $MICO_ARCH_PATH/lib/libmico${MICO_VERSION}.a ] +if [ ! "$WM_ARCH" = "cygwin" -a ! -r $MICO_ARCH_PATH/lib/libmico${MICO_VERSION}.a ] then cd $MICO_PATH gmake distclean diff -Naur OpenFOAM-1.3.CaseInsensitive/src/OpenFOAM/Make/files OpenFOAM-1.3/src/OpenFOAM/Make/files --- OpenFOAM-1.3.CaseInsensitive/src/OpenFOAM/Make/files 2006-03-23 14:00:35.000000000 -0800 +++ OpenFOAM-1.3/src/OpenFOAM/Make/files 2006-04-07 14:33:18.000000000 -0700 @@ -420,4 +420,8 @@ $(writers)/xmgrGraph/xmgrGraph.C $(writers)/jplotGraph/jplotGraph.C +(import) ../Pstream/dummy/Pstream.C +(import) ../Pstream/dummy/IPread.C +(import) ../Pstream/dummy/OPwrite.C + LIB = $(FOAM_LIBBIN)/libOpenFOAM diff -Naur OpenFOAM-1.3.CaseInsensitive/src/OpenFOAM/Make/options OpenFOAM-1.3/src/OpenFOAM/Make/options --- OpenFOAM-1.3.CaseInsensitive/src/OpenFOAM/Make/options 2005-12-07 06:00:51.000000000 -0800 +++ OpenFOAM-1.3/src/OpenFOAM/Make/options 2006-04-07 14:32:59.000000000 -0700 @@ -2,4 +2,14 @@ -DWM_PROJECT_VERSION='"'$(WM_PROJECT_VERSION)'"' \ -I$(LIB_SRC)/zlib-1.2.1 -LIB_LIBS = -L$(FOAM_LIBBIN)/dummy -lPstream -lfoamUser -lz +#ifdef cygwin +LIB_LIBS = \ + -lfoamUser \ + -lz +#else +LIB_LIBS = \ + -L$(FOAM_LIBBIN)/dummy \ + -lPstream \ + -lfoamUser \ + -lz +#endif