Browse Source

Cope with both ATI stream and AMD APP SDK roots being set when building.

Con Kolivas 13 years ago
parent
commit
8fb777a2dd
1 changed files with 3 additions and 1 deletions
  1. 3 1
      configure.ac

+ 3 - 1
configure.ac

@@ -114,7 +114,9 @@ fi
 if test "x$ATISTREAMSDKROOT" != x; then
 if test "x$ATISTREAMSDKROOT" != x; then
 	OPENCL_FLAGS="-I$ATISTREAMSDKROOT/include $OPENCL_FLAGS"
 	OPENCL_FLAGS="-I$ATISTREAMSDKROOT/include $OPENCL_FLAGS"
 	OPENCL_LIBS="-L$ATISTREAMSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
 	OPENCL_LIBS="-L$ATISTREAMSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
-elif test "x$AMDAPPSDKROOT" != x; then
+fi
+
+if test "x$AMDAPPSDKROOT" != x; then
 	OPENCL_FLAGS="-I$AMDAPPSDKROOT/include $OPENCL_FLAGS"
 	OPENCL_FLAGS="-I$AMDAPPSDKROOT/include $OPENCL_FLAGS"
 	OPENCL_LIBS="-L$AMDAPPSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
 	OPENCL_LIBS="-L$AMDAPPSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
 fi
 fi