From b1dbed83b272b15170f3680caa6310517c729888 Mon Sep 17 00:00:00 2001 From: Gambhiro Date: Sun, 24 Jan 2016 13:48:43 +0000 Subject: [PATCH 1/2] test for different CL and GL paths --- Builds/create-symlinks.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Builds/create-symlinks.sh b/Builds/create-symlinks.sh index aa15f27..f8944c6 100755 --- a/Builds/create-symlinks.sh +++ b/Builds/create-symlinks.sh @@ -23,14 +23,28 @@ if [[ ! -e $linkpath && -e $targetpath ]]; then ln -s "$targetpath" "$linkpath" fi -targetpath=$(ls -d1 /usr/include/*/GL | head -n 1) +targetpath="" + +if [ -d /usr/include/*/GL ]; then + targetpath=$(ls -d1 /usr/include/*/GL | head -n 1) +elif [ -d /usr/include/GL ]; then + targetpath="/usr/include/GL" +fi + linkpath="$LOCAL_INCLUDE_DIR/GL" if [[ ! -e $linkpath && -e $targetpath ]]; then ln -s "$targetpath" "$linkpath" fi -targetpath=$(ls -d1 /usr/include/*/CL | head -n 1) +targetpath="" + +if [ -d /usr/include/*/CL ]; then + targetpath=$(ls -d1 /usr/include/*/CL | head -n 1) +elif [ -d /usr/include/CL ]; then + targetpath="/usr/include/CL" +fi + linkpath="$LOCAL_INCLUDE_DIR/CL" if [[ ! -e $linkpath && -e $targetpath ]]; then From e184557aed2122a99da6d4e4902d88e90c01d5c8 Mon Sep 17 00:00:00 2001 From: Gambhiro Date: Sun, 24 Jan 2016 15:30:16 +0000 Subject: [PATCH 2/2] note to select Qt 5 --- Data/BuildGuideLinux.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Data/BuildGuideLinux.md b/Data/BuildGuideLinux.md index eced55e..f1ee1f0 100644 --- a/Data/BuildGuideLinux.md +++ b/Data/BuildGuideLinux.md @@ -21,6 +21,12 @@ Install the OpenCL drivers and opencl support for your hardware. For Nvidia: sudo apt-get install nvidia-352 nvidia-352-dev nvidia-opencl-icd-352 nvidia-libopencl1-352 nvidia-prime nvidia-modprobe ``` +If you have both Qt 4 and 5 installed, select Qt 5 before compilation: + +``` +export QT_SELECT=qt5 +``` + Compile the binary: ```