OSDN Git Service

Eos_env
authorTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Fri, 29 Mar 2013 03:46:30 +0000 (12:46 +0900)
committerTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Fri, 29 Mar 2013 03:46:30 +0000 (12:46 +0900)
Makefile
env/Eos_env

index 4ba8a24..6ff29ec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ git-add::
        git add util
        git add hostdepend
 
+git-add-optional::
+       git add data
+
 git-commit::
        echo "Message"; read MESSAGE; echo $$MESSAGE ; \
        git commit -m "$$MESSAGE" 
index 0d67f1d..95b8aaf 100755 (executable)
@@ -195,6 +195,20 @@ if [ -d $EOS_HOME/util/$EOS_HOSTDIR/lib/vtk ]; then
                export LD_LIBRARY_PATH=$EOS_HOME/util/$EOS_HOSTDIR/lib/vtk
        fi
 fi
+if [ -d $EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib ]; then
+       if [ ! -z "$LD_LIBRARY_PATH" ]; then
+               export LD_LIBRARY_PATH=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib:$LD_LIBRARY_PATH
+       else
+               export LD_LIBRARY_PATH=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib
+       fi
+fi
+if [ -d $EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/vtk ]; then
+       if [ ! -z "$LD_LIBRARY_PATH" ]; then
+               export LD_LIBRARY_PATH=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/vtk:$LD_LIBRARY_PATH
+       else
+               export LD_LIBRARY_PATH=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/vtk
+       fi
+fi
 #echo ".Eos_env(1):$LD_LIBRARY_PATH"
 
 if [ -z "$CUDA_ROOT" ];
@@ -229,6 +243,7 @@ else
        fi
 fi
 
+export TCL_LIBRARY=
 #echo ".Eos_env(2):$LD_LIBRARY_PATH"
 #
 # ATI Stream SDK
@@ -306,3 +321,6 @@ if [ -d $ICC_ROOT ]; then
                source $ICCVARS $ICCVARS_ARG1
        fi
 fi
+
+export TCL_LIBRARY=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/tcl8.4
+export DYLD_FALLBACK_LIBRARY_PATH=$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib:$EOS_HOME/hostdepend/$EOS_HOSTDIR/util/$EOS_HOSTDIR/lib/vtk:$DYLD_FALLBACK_LIBRARY_PATH