diff --git a/README b/README index e698d955a25075698f816344c2207d7a48a22eb7..e012a7c1b01145fb3d34b14fad94c452c72ffd6e 100644 --- a/README +++ b/README @@ -105,7 +105,7 @@ If you cannot find an appropriate binary pack for your platform, you can build the complete OpenFOAM from the source-pack. First you will need to - compile or obtain a recent version of gcc (we recomend gcc-4.2.?) for + compile or obtain a recent version of gcc (we recomend gcc-4.3.?) for your platform, which may be obtained from http://gcc.gnu.org/. Install the compiler in diff --git a/etc/settings.csh b/etc/settings.csh index 1e4d509e8a574aa0e8622318e5d5a74c2db260a6..6fe52a158a15799d7a1d1dad98e2d7d6f4d72850 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -88,11 +88,11 @@ set WM_COMPILER_INST=OpenFOAM switch ("$WM_COMPILER_INST") case OpenFOAM: switch ("$WM_COMPILER") - case Gcc43: - setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH - breaksw case Gcc: - setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH + setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH + breaksw + case Gcc42: + setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH breaksw endsw diff --git a/etc/settings.sh b/etc/settings.sh index 7631ac900efdb354c200ab9e35edf073b1d98c8b..3e0206bf4af881406f02bb11e413ec890792082b 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -104,11 +104,11 @@ WM_COMPILER_INST=OpenFOAM case "$WM_COMPILER_INST" in OpenFOAM) case "$WM_COMPILER" in - Gcc43) - export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.0/platforms/$WM_ARCH$WM_COMPILER_ARCH - ;; Gcc) - export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.2.2/platforms/$WM_ARCH$WM_COMPILER_ARCH + export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH + ;; + Gcc42) + export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH ;; esac diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc42/X similarity index 100% rename from wmake/rules/linux64Gcc43/X rename to wmake/rules/linux64Gcc42/X diff --git a/wmake/rules/linux64Gcc43/c b/wmake/rules/linux64Gcc42/c similarity index 100% rename from wmake/rules/linux64Gcc43/c rename to wmake/rules/linux64Gcc42/c diff --git a/wmake/rules/linux64Gcc43/c++ b/wmake/rules/linux64Gcc42/c++ similarity index 100% rename from wmake/rules/linux64Gcc43/c++ rename to wmake/rules/linux64Gcc42/c++ diff --git a/wmake/rules/linux64Gcc43/c++Debug b/wmake/rules/linux64Gcc42/c++Debug similarity index 100% rename from wmake/rules/linux64Gcc43/c++Debug rename to wmake/rules/linux64Gcc42/c++Debug diff --git a/wmake/rules/linux64Gcc43/c++Opt b/wmake/rules/linux64Gcc42/c++Opt similarity index 100% rename from wmake/rules/linux64Gcc43/c++Opt rename to wmake/rules/linux64Gcc42/c++Opt diff --git a/wmake/rules/linux64Gcc43/c++Prof b/wmake/rules/linux64Gcc42/c++Prof similarity index 100% rename from wmake/rules/linux64Gcc43/c++Prof rename to wmake/rules/linux64Gcc42/c++Prof diff --git a/wmake/rules/linux64Gcc43/cDebug b/wmake/rules/linux64Gcc42/cDebug similarity index 100% rename from wmake/rules/linux64Gcc43/cDebug rename to wmake/rules/linux64Gcc42/cDebug diff --git a/wmake/rules/linux64Gcc43/cOpt b/wmake/rules/linux64Gcc42/cOpt similarity index 100% rename from wmake/rules/linux64Gcc43/cOpt rename to wmake/rules/linux64Gcc42/cOpt diff --git a/wmake/rules/linux64Gcc43/cProf b/wmake/rules/linux64Gcc42/cProf similarity index 100% rename from wmake/rules/linux64Gcc43/cProf rename to wmake/rules/linux64Gcc42/cProf diff --git a/wmake/rules/linux64Gcc43/dirToString b/wmake/rules/linux64Gcc42/dirToString similarity index 100% rename from wmake/rules/linux64Gcc43/dirToString rename to wmake/rules/linux64Gcc42/dirToString diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc42/general similarity index 100% rename from wmake/rules/linux64Gcc43/general rename to wmake/rules/linux64Gcc42/general diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc42/mplib similarity index 100% rename from wmake/rules/linux64Gcc43/mplib rename to wmake/rules/linux64Gcc42/mplib diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc42/mplibGAMMA similarity index 100% rename from wmake/rules/linux64Gcc43/mplibGAMMA rename to wmake/rules/linux64Gcc42/mplibGAMMA diff --git a/wmake/rules/linux64Gcc43/mplibLAM b/wmake/rules/linux64Gcc42/mplibLAM similarity index 100% rename from wmake/rules/linux64Gcc43/mplibLAM rename to wmake/rules/linux64Gcc42/mplibLAM diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc42/mplibMPICH similarity index 100% rename from wmake/rules/linux64Gcc43/mplibMPICH rename to wmake/rules/linux64Gcc42/mplibMPICH diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc42/mplibMPICH-GM similarity index 100% rename from wmake/rules/linux64Gcc43/mplibMPICH-GM rename to wmake/rules/linux64Gcc42/mplibMPICH-GM diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc42/mplibOPENMPI similarity index 100% rename from wmake/rules/linux64Gcc43/mplibOPENMPI rename to wmake/rules/linux64Gcc42/mplibOPENMPI diff --git a/wmake/rules/linux64Gcc43/wmkdep b/wmake/rules/linux64Gcc42/wmkdep similarity index 100% rename from wmake/rules/linux64Gcc43/wmkdep rename to wmake/rules/linux64Gcc42/wmkdep diff --git a/wmake/rules/linuxGcc43/X b/wmake/rules/linuxGcc42/X similarity index 100% rename from wmake/rules/linuxGcc43/X rename to wmake/rules/linuxGcc42/X diff --git a/wmake/rules/linuxGcc43/c b/wmake/rules/linuxGcc42/c similarity index 100% rename from wmake/rules/linuxGcc43/c rename to wmake/rules/linuxGcc42/c diff --git a/wmake/rules/linuxGcc43/c++ b/wmake/rules/linuxGcc42/c++ similarity index 100% rename from wmake/rules/linuxGcc43/c++ rename to wmake/rules/linuxGcc42/c++ diff --git a/wmake/rules/linuxGcc43/c++Debug b/wmake/rules/linuxGcc42/c++Debug similarity index 100% rename from wmake/rules/linuxGcc43/c++Debug rename to wmake/rules/linuxGcc42/c++Debug diff --git a/wmake/rules/linuxGcc43/c++Opt b/wmake/rules/linuxGcc42/c++Opt similarity index 100% rename from wmake/rules/linuxGcc43/c++Opt rename to wmake/rules/linuxGcc42/c++Opt diff --git a/wmake/rules/linuxGcc43/c++Prof b/wmake/rules/linuxGcc42/c++Prof similarity index 100% rename from wmake/rules/linuxGcc43/c++Prof rename to wmake/rules/linuxGcc42/c++Prof diff --git a/wmake/rules/linuxGcc43/cDebug b/wmake/rules/linuxGcc42/cDebug similarity index 100% rename from wmake/rules/linuxGcc43/cDebug rename to wmake/rules/linuxGcc42/cDebug diff --git a/wmake/rules/linuxGcc43/cOpt b/wmake/rules/linuxGcc42/cOpt similarity index 100% rename from wmake/rules/linuxGcc43/cOpt rename to wmake/rules/linuxGcc42/cOpt diff --git a/wmake/rules/linuxGcc43/cProf b/wmake/rules/linuxGcc42/cProf similarity index 100% rename from wmake/rules/linuxGcc43/cProf rename to wmake/rules/linuxGcc42/cProf diff --git a/wmake/rules/linuxGcc43/dirToString b/wmake/rules/linuxGcc42/dirToString similarity index 100% rename from wmake/rules/linuxGcc43/dirToString rename to wmake/rules/linuxGcc42/dirToString diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc42/general similarity index 100% rename from wmake/rules/linuxGcc43/general rename to wmake/rules/linuxGcc42/general diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc42/mplib similarity index 100% rename from wmake/rules/linuxGcc43/mplib rename to wmake/rules/linuxGcc42/mplib diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc42/mplibGAMMA similarity index 100% rename from wmake/rules/linuxGcc43/mplibGAMMA rename to wmake/rules/linuxGcc42/mplibGAMMA diff --git a/wmake/rules/linuxGcc43/mplibLAM b/wmake/rules/linuxGcc42/mplibLAM similarity index 100% rename from wmake/rules/linuxGcc43/mplibLAM rename to wmake/rules/linuxGcc42/mplibLAM diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc42/mplibMPICH similarity index 100% rename from wmake/rules/linuxGcc43/mplibMPICH rename to wmake/rules/linuxGcc42/mplibMPICH diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc42/mplibMPICH-GM similarity index 100% rename from wmake/rules/linuxGcc43/mplibMPICH-GM rename to wmake/rules/linuxGcc42/mplibMPICH-GM diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc42/mplibOPENMPI similarity index 100% rename from wmake/rules/linuxGcc43/mplibOPENMPI rename to wmake/rules/linuxGcc42/mplibOPENMPI diff --git a/wmake/rules/linuxGcc43/wmkdep b/wmake/rules/linuxGcc42/wmkdep similarity index 100% rename from wmake/rules/linuxGcc43/wmkdep rename to wmake/rules/linuxGcc42/wmkdep