From 3dca2cf60edb8decbf0adadd06a4e29e915f1496 Mon Sep 17 00:00:00 2001 From: Gary Frost <frost.gary@gmail.com> Date: Tue, 29 Apr 2014 13:20:02 +0000 Subject: [PATCH] Google changed their download page rules. This is a way to try to make binaries available --- com.amd.aparapi.jni/build.xml | 4 ++-- com.amd.aparapi/build.xml | 4 ++-- samples/convolution/conv.sh | 13 ++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml index c2c82201..92037cf0 100644 --- a/com.amd.aparapi.jni/build.xml +++ b/com.amd.aparapi.jni/build.xml @@ -647,8 +647,8 @@ First consider editing the properties in build.properties <!-- JDK 6 --> <arg value="-I/System/Library/Frameworks/JavaVM.framework/Headers" /> <!-- JDK 7u51 without JDK 6 --> - <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/include/" /> - <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/include/darwin/" /> + <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_12.jdk/Contents/Home/include/" /> + <arg value="-I/Library/Java/JavaVirtualMachines/jdk1.7.0_12.jdk/Contents/Home/include/darwin/" /> <arg value="-Iinclude" /> <arg value="-Isrc/cpp" /> <arg value="-Isrc/cpp/runKernel" /> diff --git a/com.amd.aparapi/build.xml b/com.amd.aparapi/build.xml index 3db47ef7..6d2c381e 100644 --- a/com.amd.aparapi/build.xml +++ b/com.amd.aparapi/build.xml @@ -72,8 +72,8 @@ srcdir="${basedir}/src/java" destdir="${basedir}/classes" includeantruntime="false"> - <compilerarg value="-Xlint"/> - <compilerarg value="-Xlint:-path"/> + <!--<compilerarg value="-Xlint"/> + <compilerarg value="-Xlint:-path"/> --> </javac> <jar jarfile="${basedir}/dist/aparapi.jar" basedir="${basedir}/classes"> <manifest> diff --git a/samples/convolution/conv.sh b/samples/convolution/conv.sh index 0d06fc6c..ae673b3b 100644 --- a/samples/convolution/conv.sh +++ b/samples/convolution/conv.sh @@ -1,7 +1,6 @@ -java \ - -Djava.library.path=../../com.amd.aparapi.jni/dist \ - -Dcom.amd.aparapi.executionMode=$1 \ - -Dcom.amd.aparapi.enableShowGeneratedOpenCL=true \ - -classpath ../../com.amd.aparapi/dist/aparapi.jar:convolution.jar \ - com.amd.aparapi.sample.convolution.Convolution $2 - +java \ + -Djava.library.path=../../com.amd.aparapi.jni/dist\ + -Dcom.amd.aparapi.executionMode=$1\ + -Dcom.amd.aparapi.enableShowGeneratedOpenCL=true\ + -classpath ../../com.amd.aparapi/dist/aparapi.jar:convolution.jar\ + com.amd.aparapi.sample.convolution.Convolution $2 -- GitLab