From ecc80bd763111b0e368aa80366bd8382cd814ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 18 Jan 2014 03:32:31 +0100 Subject: Change the native extraction/loading logic. --- depends/launcher/org/multimc/onesix/OneSixLauncher.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'depends/launcher') diff --git a/depends/launcher/org/multimc/onesix/OneSixLauncher.java b/depends/launcher/org/multimc/onesix/OneSixLauncher.java index d6c80b67..c1676c94 100644 --- a/depends/launcher/org/multimc/onesix/OneSixLauncher.java +++ b/depends/launcher/org/multimc/onesix/OneSixLauncher.java @@ -70,7 +70,7 @@ public class OneSixLauncher implements Launcher List allNativePaths = new ArrayList(); boolean is_64 = property.equalsIgnoreCase("x86_64") || property.equalsIgnoreCase("amd64"); allNativePaths.add(natives); - allNativePaths.add(Utils.combine(natives, is_64 ? "64" : "32")); + allNativePaths.add(natives + "/" + (is_64 ? "64" : "32")); // print the pretty things { @@ -110,7 +110,8 @@ public class OneSixLauncher implements Launcher final ClassLoader cl = ClassLoader.getSystemClassLoader(); // set up the natives path(s). - System.setProperty("java.library.path", Utils.join(allNativePaths, String.valueOf(File.pathSeparatorChar)) ); + String libpath = Utils.join(allNativePaths, String.valueOf(File.pathSeparatorChar)); + System.setProperty("java.library.path", libpath); Field fieldSysPath; try { -- cgit v1.2.3