From 68c77a479c87e03b53d561e1b87e649c85ff1e40 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Mon, 15 Feb 2021 12:48:10 -0500
Subject: [PATCH] Updated to use newer version of docker container with latest
mac SDK. Added include directive for darwin opencl.
---
buildDarwin.sh | 1 -
configure.ac | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/buildDarwin.sh b/buildDarwin.sh
index b424280..4b3358d 100755
--- a/buildDarwin.sh
+++ b/buildDarwin.sh
@@ -1,7 +1,6 @@
#!/bin/sh
echo "Aparapi Darwin (OSX) x86_64 compilation started..."
-export PATH=/usr/osxcross/bin:/usr/osxcross:$PATH
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre
rm -rf .libs64/linux .libs32/linux
make clean
diff --git a/configure.ac b/configure.ac
index bcdfcd2..ea20876 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,8 @@ AM_INIT_AUTOMAKE([subdir-objects])
case $host_os in
darwin* )
- CC=${CC-/usr/osxcross/bin/x86_64-apple-darwin14-clang}
- CXX=${CXX-/usr/osxcross/bin/x86_64-apple-darwin14-clang++}
+ CC=${CC-/usr/osxcross/bin/x86_64-apple-darwin20.2-clang}
+ CXX=${CXX-/usr/osxcross/bin/x86_64-apple-darwin20.2-clang++}
;;
esac
@@ -44,7 +44,7 @@ AC_SUBST(HOST_ARCH)
case $host_os in
darwin* )
AC_LDFLAGS="-framework OpenCL -version-info 5:3:4"
- AC_CPPFLAGS="-Iinclude -I/opt/AMDAPP/SDK/include -Isrc/cpp -Isrc/cpp/runKernel -Isrc/cpp/invoke -I${JAVA_HOME}/include/darwin -I${JAVA_HOME}/include -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/ -DCL_USE_DEPRECATED_OPENCL_1_1_APIS"
+ AC_CPPFLAGS="-Iinclude -I/opt/AMDAPP/SDK/include -Isrc/cpp -Isrc/cpp/runKernel -Isrc/cpp/invoke -I/usr/src/khronos-OpenCL-headers -I${JAVA_HOME}/include/darwin -I${JAVA_HOME}/include -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/ -DCL_USE_DEPRECATED_OPENCL_1_1_APIS"
;;
mingw*)
case $HOST_CPU_BITS in
--
GitLab