From f26649af32ad6252d8d3745b72fa57a49bbce688 Mon Sep 17 00:00:00 2001
From: Vahagn Khachatryan <vahagn.khachatryan@gmail.com>
Date: Sun, 12 Feb 2017 08:15:07 +0000
Subject: [PATCH] .vimrc.local is revisited.

---
 .vimrc.amy-vkhachat-w7 | 29 -------------------
 .vimrc.linux           | 26 -----------------
 .vimrc.local           | 64 ++++++++++++++++++++++++++++++++++++++----
 3 files changed, 59 insertions(+), 60 deletions(-)
 delete mode 100644 .vimrc.amy-vkhachat-w7
 delete mode 100644 .vimrc.linux

diff --git a/.vimrc.amy-vkhachat-w7 b/.vimrc.amy-vkhachat-w7
deleted file mode 100644
index 843c823..0000000
--- a/.vimrc.amy-vkhachat-w7
+++ /dev/null
@@ -1,29 +0,0 @@
-set path+=C:/Progra~2/Micros~1.0/VC/include
-"
-"	the root of all 3pty libraries
-"
-let g:srcdir=$HOME . "\\src"
-"
-"	BOOST
-"
-let g:boostdir=g:srcdir."\\boost_1_56_0"
-let g:boostinc=g:boostdir
-let g:boostlib=g:boostdir."\\stage\\win64_vc12\\lib"
-let g:boostbin=g:boostlib
-let g:Bboost=g:boostbin.";"
-let g:Iboost=" /I\"".g:boostinc."\""
-let g:Lboost=" /LIBPATH:\"".g:boostlib."\""
-exec "set path+=".g:boostinc
-"
-"	Intel TBB
-"
-let g:tbbdir=g:srcdir."\\tbb43_20140724oss"
-let g:tbbinc=g:tbbdir."\\include"
-let g:tbblib=g:tbbdir."\\lib\\intel64\\vc12"
-let g:tbbbin=g:tbbdir."\\bin\\intel64\\vc12"
-let g:Btbb=g:tbbbin.";"
-let g:Itbb=" /I\"".g:tbbinc."\""
-let g:Ltbb=" /LIBPATH:\"".g:tbblib."\" tbb.lib"
-let g:tbbmalloc=" tbbmalloc.lib"
-let g:tbbmproxy=" tbbmalloc_proxy.lib"
-exec "set path+=".g:tbbinc
diff --git a/.vimrc.linux b/.vimrc.linux
deleted file mode 100644
index 1673880..0000000
--- a/.vimrc.linux
+++ /dev/null
@@ -1,26 +0,0 @@
-"
-"	the root of all 3pty libraries
-"
-let g:srcdir=$HOME . "/src"
-"
-"	BOOST
-"
-let g:boostdir=g:srcdir."/boost_1_53_0"
-let g:boostinc=g:boostdir
-let g:boostlib=g:boostdir."/lib-amd64/lib"
-let g:boostbin=g:boostlib
-let g:Bboost=g:boostbin.":"
-let g:Iboost=" -I".g:boostinc
-let g:Lboost=" -L".g:boostlib
-"
-"	Intel TBB
-"
-let g:tbbdir=g:srcdir."/tbb41_20130116oss"
-let g:tbbinc=g:tbbdir."/include"
-let g:tbblib=g:tbbdir."/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
-let g:tbbbin=g:tbblib
-let g:Btbb=g:tbbbin.":"
-let g:Itbb=" -I".g:tbbinc
-let g:Ltbb=" -L".g:tbblib." -ltbb"
-let g:tbbmalloc=" -ltbbmalloc"
-let g:tbbmproxy=" -ltbbmalloc_proxy"
diff --git a/.vimrc.local b/.vimrc.local
index bf3e82a..ff63af6 100644
--- a/.vimrc.local
+++ b/.vimrc.local
@@ -3,9 +3,63 @@ let s:vimrc=expand('<sfile>:p:r')
 let s:host=hostname()
 
 if filereadable(s:vimrc.'.'.s:host)
-	execute ':source '.s:vimrc.'.'.s:host
-elseif filereadable(s:vimrc.'.win64') && has('win64')
-	execute ':source '.s:vimrc.'.win64'
-elseif filereadable(s:vimrc.'.linux') && has('unix') 
-	execute ':source '.s:vimrc.'.linux'
+    execute ':source '.s:vimrc.'.'.s:host
+
+elseif has('win64')
+    set path+=C:/Progra~2/Micros~1.0/VC/include
+    "
+    "   the root of all 3pty libraries
+    "
+    let g:srcdir=$HOME . "\\src"
+    "
+    "   BOOST
+    "
+    let g:boostdir=g:srcdir."\\boost_1_56_0"
+    let g:boostinc=g:boostdir
+    let g:boostlib=g:boostdir."\\stage\\win64_vc12\\lib"
+    let g:boostbin=g:boostlib
+    let g:Bboost=g:boostbin.";"
+    let g:Iboost=" /I\"".g:boostinc."\""
+    let g:Lboost=" /LIBPATH:\"".g:boostlib."\""
+    exec "set path+=".g:boostinc
+    "
+    "   Intel TBB
+    "
+    let g:tbbdir=g:srcdir."\\tbb43_20140724oss"
+    let g:tbbinc=g:tbbdir."\\include"
+    let g:tbblib=g:tbbdir."\\lib\\intel64\\vc12"
+    let g:tbbbin=g:tbbdir."\\bin\\intel64\\vc12"
+    let g:Btbb=g:tbbbin.";"
+    let g:Itbb=" /I\"".g:tbbinc."\""
+    let g:Ltbb=" /LIBPATH:\"".g:tbblib."\" tbb.lib"
+    let g:tbbmalloc=" tbbmalloc.lib"
+    let g:tbbmproxy=" tbbmalloc_proxy.lib"
+    exec "set path+=".g:tbbinc
+elseif has('unix') 
+    "
+    "   the root of all 3pty libraries
+    "
+    let g:srcdir=$HOME . "/src"
+    "
+    "   BOOST
+    "
+    let g:boostdir=g:srcdir."/boost_1_53_0"
+    let g:boostinc=g:boostdir
+    let g:boostlib=g:boostdir."/lib-amd64/lib"
+    let g:boostbin=g:boostlib
+    let g:Bboost=g:boostbin.":"
+    let g:Iboost=" -I".g:boostinc
+    let g:Lboost=" -L".g:boostlib
+    "
+    "   Intel TBB
+    "
+    let g:tbbdir=g:srcdir."/tbb41_20130116oss"
+    let g:tbbinc=g:tbbdir."/include"
+    let g:tbblib=g:tbbdir."/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
+    let g:tbbbin=g:tbblib
+    let g:Btbb=g:tbbbin.":"
+    let g:Itbb=" -I".g:tbbinc
+    let g:Ltbb=" -L".g:tbblib." -ltbb"
+    let g:tbbmalloc=" -ltbbmalloc"
+    let g:tbbmproxy=" -ltbbmalloc_proxy"
 endif