diff --git a/etc/bashrc.mingw b/etc/bashrc.mingw index 4ba174686..d94a20e92 100644 --- a/etc/bashrc.mingw +++ b/etc/bashrc.mingw @@ -35,19 +35,21 @@ # #------------------------------------------------------------------------------ +export PROGRAMS_HOME=/c/Programs + # {{{ DEFINE USER EDITABLE FUNCTIONS set_system_paths() { echo "Setting installations directories of required tools ..." - export CMAKE_HOME=/c/Programs/cmake-3.2.3-win32-x86 - #export GIT_HOME=/c/Programs/Git + export CMAKE_HOME=$PROGRAMS_HOME/cmake-3.2.3-win32-x86 + export GIT_HOME=$PROGRAMS_HOME/Git #export JAVA_HOME="/c/Program Files/Java/jre1.8.0_45" - export MINGW_HOME=/c/Programs/x86_64-4.8.2-release-win32-seh-rt_v3-rev3/mingw64 - export MPI_ROOTDIR=/c/Programs/OpenMPI_v1.6.1-x64 - export PERL_HOME=/c/Programs/strawberry-perl-5.20.2.1-64bit/perl - #export PEXPORTS_HOME=/c/Programs/pexports-0.46-mingw32 - #export PYTHON_HOME=/c/Programs/Python27 - #export SUBVERSION_HOME=/c/Programs/svn-win32-1.8.13 - export WGET_HOME=/c/Programs/wget-1.11.4-1 + export MINGW_HOME=$PROGRAMS_HOME/mingw64 + export MPI_ROOTDIR=$PROGRAMS_HOME/OpenMPI_v1.6.1-x64 + #export PERL_HOME=$PROGRAMS_HOME/strawberry-perl-5.20.2.1-64bit/perl + export PEXPORTS_HOME=$PROGRAMS_HOME/pexports + #export PYTHON_HOME=$PROGRAMS_HOME/Python27 + #export SUBVERSION_HOME=$PROGRAMS_HOME/svn-win32-1.8.13 + export WGET_HOME=$PROGRAMS_HOME/wget export ZIP_HOME="/c/Program Files/7-Zip" } @@ -58,11 +60,11 @@ add_to_path() { #export PATH=$JAVA_HOME/bin:$PATH #export PATH=$PYTHON_HOME:$PATH #export PATH=$SUBVERSION_HOME/bin:$PATH - #export PATH=$GIT_HOME/cmd:$PATH - export PATH=$PERL_HOME/bin:$PATH + export PATH=$GIT_HOME/cmd:$PATH + #export PATH=$PERL_HOME/bin:$PATH export PATH=$CMAKE_HOME/bin:$PATH export PATH=$MPI_ROOTDIR/bin:$PATH - #export PATH=$PEXPORTS_HOME/bin:$PATH + export PATH=$PEXPORTS_HOME:$PATH export PATH=$MINGW_HOME/bin:$PATH } # }}} diff --git a/wmake/rules/MINGW32_NT-6.1Gcc/mplibOPENMPI b/wmake/rules/MINGW32_NT-6.1Gcc/mplibOPENMPI index 6401eddf3..50018e30b 100644 --- a/wmake/rules/MINGW32_NT-6.1Gcc/mplibOPENMPI +++ b/wmake/rules/MINGW32_NT-6.1Gcc/mplibOPENMPI @@ -1,3 +1,3 @@ PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I/c/Programs/OpenMPI_v1.6.1-x64/include -PLIBS = -L/c/Programs/OpenMPI_v1.6.1-x64/lib -lmpi +PINC = -I$(OPENMPI_DIR)/include +PLIBS = -L$(OPENMPI_DIR)/lib -lmpi