Skip to content

Commit

Permalink
Bumped library version to 1.3.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
freemo committed Feb 11, 2018
1 parent 2a57b30 commit dd51734
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ATTRIBUTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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/.
under those regulations, please refer to the U.S. Bureau of Industry and Security�s website at http://www.bis.doc.gov/.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dd51734

Please sign in to comment.