From e7793a66287479a26303fcde0174f8b5757b2ce7 Mon Sep 17 00:00:00 2001
From: Ryan LaMothe <ryan.lamothe@quantumworx.com>
Date: Sun, 19 Feb 2012 20:04:16 +0000
Subject: [PATCH] Partially reverted the JNI native library naming scheme and
will instead adjust the native library lookup algorithm in the applet-loader
source code
---
com.amd.aparapi.jni/build.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index f4afbe17..9286657e 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -284,7 +284,7 @@
</target>
<target name="gcc" if="use.gcc">
- <mkdir dir="${basedir}/dist/linux/${os.arch}"/>
+ <mkdir dir="${basedir}/dist"/>
<echo message="linuxcc ${os.arch}" />
<exec executable="g++">
<arg value="-O3" />
@@ -296,7 +296,7 @@
<arg value="-I${amd.app.sdk.dir}/include" />
<arg value="-shared" />
<arg value="-o" />
- <arg value="${basedir}/dist/linux/${os.arch}/libaparapi_${x86_or_x86_64}.jnilib" />
+ <arg value="${basedir}/dist/libaparapi_${x86_or_x86_64}.so" />
<arg value="src/cpp/aparapi.cpp" />
<arg value="-L${amd.app.sdk.dir}/lib/${x86_or_x86_64}" />
<arg value="-lOpenCL" />
@@ -304,7 +304,7 @@
</target>
<target name="gcc_mac" if="use.gcc_mac">
- <mkdir dir="${basedir}/dist/mac/${os.arch}"/>
+ <mkdir dir="${basedir}/dist"/>
<echo message="gcc ${os.arch}" />
<exec executable="g++">
<arg value="-O3" />
@@ -315,7 +315,7 @@
<arg value="-Iinclude" />
<arg value="-shared" />
<arg value="-o" />
- <arg value="${basedir}/dist/mac/${os.arch}/libaparapi_${x86_or_x86_64}.jnilib" />
+ <arg value="${basedir}/dist/libaparapi_${x86_or_x86_64}.dylib" />
<arg value="src/cpp/aparapi.cpp" />
<arg value="-framework" />
<arg value="OpenCL" />
@@ -323,7 +323,7 @@
</target>
<target name="msvc" if="use.msvc">
- <mkdir dir="${basedir}/dist/windows/${os.arch}"/>
+ <mkdir dir="${basedir}\dist"/>
<echo message="msvc ${os.arch}" />
<exec executable="${msvc.dir}\vc\bin\${optional.amd64.subdir}cl.exe">
<env key="PATH" path="${env.PATH};${msvc.dir}\\Common7\\IDE" />
@@ -343,12 +343,12 @@
<arg value="/libpath:${msvc.sdk.dir}\lib\${optional.x64.subdir}" />
<arg value="/libpath:${amd.app.sdk.dir}\lib\${x86_or_x86_64}" />
<arg value="OpenCL.lib" />
- <arg value="/out:${basedir}\dist\windows\${os.arch}\aparapi_${x86_or_x86_64}.jnilib" />
+ <arg value="/out:${basedir}\dist\aparapi_${x86_or_x86_64}.dll" />
</exec>
</target>
<target name="mingw" if="use.mingw">
- <mkdir dir="${basedir}/dist/windows/${os.arch}"/>
+ <mkdir dir="${basedir}\dist"/>
<echo message="mingw ${os.arch}" />
<exec executable="${mingw.dir}/bin/g++">
<env key="PATH" path="${env.PATH};${mingw.dir}/bin" />
@@ -361,7 +361,7 @@
<arg value="-I${amd.app.sdk.dir}\include" />
<arg value="-shared" />
<arg value="-o" />
- <arg value="${basedir}\dist\windows\${os.arch}\aparapi_${x86_or_x86_64}.jnilib" />
+ <arg value="${basedir}\dist\aparapi_${x86_or_x86_64}.dll" />
<arg value="src\cpp\aparapi.cpp" />
<arg value="-L${amd.app.sdk.dir}\lib\${x86_or_x86_64}" />
<arg value="-lOpenCL" />
--
GitLab