From 301aae9b8e55d28f36a038ff813ab8e9d8bd99ac Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sat, 19 Mar 2022 11:07:46 +0100 Subject: [PATCH] NativeLibrary: use `System.mapLibraryName()` instead of own implementation --- .../ui/FlatWindowsNativeWindowBorder.java | 2 +- .../com/formdev/flatlaf/util/NativeLibrary.java | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java index 74786e87..587dff5e 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java @@ -136,7 +136,7 @@ class FlatWindowsNativeWindowBorder String libraryPath = System.getProperty( FlatSystemProperties.NATIVE_LIBRARY_PATH ); if( libraryPath != null ) { - File libraryFile = new File( libraryPath, libraryName + ".dll" ); + File libraryFile = new File( libraryPath, System.mapLibraryName( libraryName ) ); if( libraryFile.exists() ) return new NativeLibrary( libraryFile, true ); else diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/NativeLibrary.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/NativeLibrary.java index dfa0f509..018694fb 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/NativeLibrary.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/NativeLibrary.java @@ -143,16 +143,19 @@ public class NativeLibrary } } + /** + * Add prefix and suffix to library name. + * + */ private static String decorateLibraryName( String libraryName ) { - if( SystemInfo.isWindows ) - return libraryName.concat( ".dll" ); - - String suffix = SystemInfo.isMacOS ? ".dylib" : ".so"; - int sep = libraryName.lastIndexOf( '/' ); return (sep >= 0) - ? libraryName.substring( 0, sep + 1 ) + "lib" + libraryName.substring( sep + 1 ) + suffix - : "lib" + libraryName + suffix; + ? libraryName.substring( 0, sep + 1 ) + System.mapLibraryName( libraryName.substring( sep + 1 ) ) + : System.mapLibraryName( libraryName ); } private static void log( String msg, Throwable thrown ) {