From b74ab6b869061ef234ae9a2808df01a92207e203 Mon Sep 17 00:00:00 2001 From: Adam Murdoch Date: Fri, 6 Dec 2013 19:01:33 +1100 Subject: [PATCH] Fixes for finding dev-time binaries in their new location. --- .../platform/internal/NativeLibraryLocator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/rubygrapefruit/platform/internal/NativeLibraryLocator.java b/src/main/java/net/rubygrapefruit/platform/internal/NativeLibraryLocator.java index c7dbd66..075ba39 100755 --- a/src/main/java/net/rubygrapefruit/platform/internal/NativeLibraryLocator.java +++ b/src/main/java/net/rubygrapefruit/platform/internal/NativeLibraryLocator.java @@ -72,7 +72,13 @@ public class NativeLibraryLocator { } } - File libFile = new File(String.format("build/binaries/%s/%s", libraryDef.platform, libraryDef.name)); + String componentName = libraryDef.name.replaceFirst("^lib", "").replaceFirst("\\.\\w+$", ""); + int pos = componentName.indexOf("-"); + while (pos >= 0) { + componentName = componentName.substring(0, pos) + Character.toUpperCase(componentName.charAt(pos + 1)) + componentName.substring(pos + 2); + pos = componentName.indexOf("-", pos); + } + File libFile = new File(String.format("build/binaries/%sSharedLibrary/%s/%s", componentName, libraryDef.platform.replace("-", "_"), libraryDef.name)); if (libFile.isFile()) { return libFile; }