From dd51734fc356aa7a32ba4ac3853340d2279e1476 Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman Date: Sun, 11 Feb 2018 18:42:46 -0500 Subject: [PATCH] Bumped library version to 1.3.0. --- ATTRIBUTIONS.md | 4 ++-- CHANGELOG.md | 2 +- configure.ac | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md index 05b7296..f216222 100644 --- a/ATTRIBUTIONS.md +++ b/ATTRIBUTIONS.md @@ -10,7 +10,7 @@ Copyright (c) 2010-2011, Advanced Micro Devices, Inc. All rights reserved. ## Licenses Aparapi is currently licensed under the Apache License version 2. However it is important to note that this project has -used code from other projects originally licensed under seperate, but compatible licenses. Since these license require +used code from other projects originally licensed under separate, but compatible licenses. Since these license require retaining original copyrights, and a reference to the original license it is important to mention that here. The text of the original license used by AMD contained the following text: @@ -48,4 +48,4 @@ E:1 or E:2 any restricted technology, software, or source code you receive hereu D:1, E:1 or E:2 the direct product of such technology or software, if such foreign produced direct product is subject to national security controls as identified on the Commerce Control List (currently found in Supplement 1 to Part 774 of EAR). For the most current Country Group listings, or for additional information about the EAR or your obligations -under those regulations, please refer to the U.S. Bureau of Industry and Security�s website at http://www.bis.doc.gov/. \ No newline at end of file +under those regulations, please refer to the U.S. Bureau of Industry and Security�s website at http://www.bis.doc.gov/. diff --git a/CHANGELOG.md b/CHANGELOG.md index d97d75e..cc7e8c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Aparapi jni Change Log -## 1.2.1 +## 1.3.0 * createProgram in Java had the wrong signature producing a unsatisfied link exception that is now fixed. * The same scripts can now compile for Linux and OSX and potentially even windows. diff --git a/configure.ac b/configure.ac index f5c44ae..2b450ec 100644 --- a/configure.ac +++ b/configure.ac @@ -8,15 +8,15 @@ AC_CONFIG_FILES([Makefile]) AC_CANONICAL_HOST case $host_os in darwin* ) - AC_LDFLAGS="-framework OpenCL -version-info 3:1:2" + AC_LDFLAGS="-framework OpenCL -version-info 4:0:3" 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" ;; mingw*) - AC_LDFLAGS="-no-undefined -lOpenCL -version-info 3:1:2" + AC_LDFLAGS="-no-undefined -lOpenCL -version-info 4:0:3" AC_CPPFLAGS="-Iinclude -I/opt/AMDAPP/SDK/include -Isrc/cpp -Isrc/cpp/runKernel -Isrc/cpp/invoke -I/usr/lib/jvm/java-8-openjdk/include -I/usr/lib/jvm/java-8-openjdk/include/linux -I/usr/lib/jvm/java-8-openjdk-amd64/include -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/ -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -fpermissive" ;; *) - AC_LDFLAGS="-lOpenCL -version-info 3:1:2" + AC_LDFLAGS="-lOpenCL -version-info 4:0:3" AC_CPPFLAGS="-Iinclude -I/opt/AMDAPP/SDK/include -Isrc/cpp -Isrc/cpp/runKernel -Isrc/cpp/invoke -I/usr/lib/jvm/java-8-openjdk/include -I/usr/lib/jvm/java-8-openjdk/include/linux -I/usr/lib/jvm/java-8-openjdk-amd64/include -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/ -DCL_USE_DEPRECATED_OPENCL_1_1_APIS" ;; esac