From 5c4e6675090950e22e75f40e5c6f937b23df0e77 Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Date: Sat, 10 Dec 2016 16:32:05 -0500 Subject: [PATCH] Changed the filenames for the native libraries. --- pom.xml | 2 +- src/main/java/com/aparapi/natives/NativeLoader.java | 4 ++-- .../linux/{x86/libaparapi.so => libaparapi_x86.so} | Bin .../{x86_64/libaparapi.so => libaparapi_x86_64.so} | Bin 4 files changed, 3 insertions(+), 3 deletions(-) rename src/main/resources/linux/{x86/libaparapi.so => libaparapi_x86.so} (100%) rename src/main/resources/linux/{x86_64/libaparapi.so => libaparapi_x86_64.so} (100%) diff --git a/pom.xml b/pom.xml index dd96329..365fc4f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>com.aparapi</groupId> <artifactId>aparapi-jni</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/src/main/java/com/aparapi/natives/NativeLoader.java b/src/main/java/com/aparapi/natives/NativeLoader.java index a8227d3..ab9a56d 100644 --- a/src/main/java/com/aparapi/natives/NativeLoader.java +++ b/src/main/java/com/aparapi/natives/NativeLoader.java @@ -14,8 +14,8 @@ public class NativeLoader { // ? "64" : "32"; final String arch = System.getProperty("os.arch"); if( arch.contains("64")) - NativeUtils.loadLibraryFromJar("/linux/x86_64/libaparapi.so"); + NativeUtils.loadLibraryFromJar("/linux/libaparapi_x86_64.so"); else - NativeUtils.loadLibraryFromJar("/linux/x86/libaparapi.so"); + NativeUtils.loadLibraryFromJar("/linux/libaparapi_x86.so"); } } diff --git a/src/main/resources/linux/x86/libaparapi.so b/src/main/resources/linux/libaparapi_x86.so similarity index 100% rename from src/main/resources/linux/x86/libaparapi.so rename to src/main/resources/linux/libaparapi_x86.so diff --git a/src/main/resources/linux/x86_64/libaparapi.so b/src/main/resources/linux/libaparapi_x86_64.so similarity index 100% rename from src/main/resources/linux/x86_64/libaparapi.so rename to src/main/resources/linux/libaparapi_x86_64.so -- GitLab