From 3405a68ec6941435e03c7dc611546794f8f5ca1a Mon Sep 17 00:00:00 2001 From: yuanjiajia <1139393632@qq.com> Date: Tue, 31 May 2022 10:38:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A3=80=E6=B5=8BCPU?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=9B=E5=BB=BA=E8=BD=AF=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=97=B6=E5=A4=B1=E8=B4=A5=E8=87=B4=E7=BC=96=E8=AF=91=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B0=86LuxCore=E4=B8=ADbin=E7=9B=AE=E5=BD=95=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build | 1 + first_run.sh | 7 ++++--- installLib/cblosc-install.sh | 2 ++ installLib/embree-install.sh | 2 ++ installLib/oidn-install.sh | 4 +++- installLib/qt-install.sh | 2 ++ installLib/tbb-install.sh | 2 ++ 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/build b/build index fd46231..537b6b4 100755 --- a/build +++ b/build @@ -208,6 +208,7 @@ if [[ $STAGE && $STAGE < $NEXT ]] ; then echo $BOUNDARYSTART ${SHELLROOT}/compileing/compile-LuxCore.sh "$TARGET" complete_stage $NEXT $? + echo -n "export PATH=${SHELLROOT}/LuxCore/bin" | sudo tee -a /etc/profile echo $BOUNDARYEND fi diff --git a/first_run.sh b/first_run.sh index ee641ea..5ea4662 100755 --- a/first_run.sh +++ b/first_run.sh @@ -29,6 +29,7 @@ export BOUNDARYEND="<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< # patchelf 是一个用来修改elf格式的动态库和可执行程序的小工具,可以修改动态链接库的库名字,以及链接库的RPATH。 # RPATH规定了可执行文件在寻找.so文件时的第一优先位置。另外,elf文件中还规定了runpath。它与rpath # 相同,只是优先级低一些 +# ocl-icd-opencl-dev 当 CPU平台 为 Intel 系列时,需要安装 libOpenCL.so 库 echo $BOUNDARYSTART echo -e "\n运行脚本需要使用下列工具,如果没有将会被安装,按回车键继 ……" echo -e "\n\n[ libtool-bin cmake flex bison libgtk-3-dev libgl1-mesa-dev python3-dev python3-numpy git patchelf ]\n\n" @@ -37,9 +38,9 @@ sudo apt update sudo apt install -y libtool-bin cmake flex bison libgtk-3-dev libgl1-mesa-dev python3-dev python3-numpy git patchelf echo -e "\n\n正在检查 CPU 平台 ……\n" sleep 1 -CPU=`cat /proc/cpuinfo | grep "model name"` -echo -e "$CPU\n\n" -if [ `echo $CPU | grep "Intel(R)"` ] ; then +CPUINFO=`cat /proc/cpuinfo | grep "model name"` +echo -e "$CPUINFO\n\n" +if [ `echo $CPUINFO | grep "Intel(R)"` ] ; then sudo apt install ocl-icd-opencl-dev fi echo -e "\n\n已经安装完成 运行脚本需要的工具 ……\n" diff --git a/installLib/cblosc-install.sh b/installLib/cblosc-install.sh index b48edb0..e775f57 100755 --- a/installLib/cblosc-install.sh +++ b/installLib/cblosc-install.sh @@ -12,3 +12,5 @@ mkdir -p $LIBRARY_INSTALL_DIR cp -vr include/*.h $INCLUDE_INSTALL_DIR cp -vr lib/lib*.a $LIBRARY_INSTALL_DIR + +exit 0; diff --git a/installLib/embree-install.sh b/installLib/embree-install.sh index bdaaacd..ca352c7 100755 --- a/installLib/embree-install.sh +++ b/installLib/embree-install.sh @@ -19,3 +19,5 @@ cp $LIBRARY_INSTALL_DIR/libtbb.so.12.1 $LIBRARY_INSTALL_DIR/libtbb.so.12 sudo cp $LIBRARY_INSTALL_DIR/libembree3.so.3 /usr/local/lib sudo cp $LIBRARY_INSTALL_DIR/libembree3.so /usr/local/lib + +exit 0; diff --git a/installLib/oidn-install.sh b/installLib/oidn-install.sh index b18b181..3c909f6 100755 --- a/installLib/oidn-install.sh +++ b/installLib/oidn-install.sh @@ -18,4 +18,6 @@ cp $LIBRARY_INSTALL_DIR/libtbb.so.12.1 $LIBRARY_INSTALL_DIR/libtbb.so.12 sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so /usr/local/lib/libOpenImageDenoise.so sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so.1 /usr/local/lib/libOpenImageDenoise.so.1 -sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so.1.4.0 /usr/local/lib/libOpenImageDenoise.so.1.4.0 \ No newline at end of file +sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so.1.4.0 /usr/local/lib/libOpenImageDenoise.so.1.4.0 + +exit 0; diff --git a/installLib/qt-install.sh b/installLib/qt-install.sh index b8dd54a..4fb6e52 100755 --- a/installLib/qt-install.sh +++ b/installLib/qt-install.sh @@ -6,3 +6,5 @@ cp -av 5.12.2/gcc_64/include $1/qt5-v5.12.2 cp -av 5.12.2/gcc_64/lib $1/qt5-v5.12.2 cp -av 5.12.2/gcc_64/mkspecs $1/qt5-v5.12.2 cp -av 5.12.2/gcc_64/plugins $1/qt5-v5.12.2 + +exit 0; diff --git a/installLib/tbb-install.sh b/installLib/tbb-install.sh index 540f7f5..6d77d96 100755 --- a/installLib/tbb-install.sh +++ b/installLib/tbb-install.sh @@ -15,3 +15,5 @@ cp -vr ../tbb2019_20191006oss/lib/intel64/gcc4.8/lib* $LIBRARY_INSTALL_DIR sudo ln -s ${LIBRARY_INSTALL_DIR}/libtbb.so.2 /usr/local/lib/libtbb.so.2 sudo ln -s ${LIBRARY_INSTALL_DIR}/libtbb.so.12 /usr/local/lib/libtbb.so.12 + +exit 0;