diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-18 03:32:31 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-18 03:33:04 +0100 |
| commit | ecc80bd763111b0e368aa80366bd8382cd814ee6 (patch) | |
| tree | 5f910b6b571653c79193e2a7a46236111d13fec5 /depends/launcher | |
| parent | 188d0d58865f5e134b5803bda2cd631a61cf2915 (diff) | |
| download | MultiMC-ecc80bd763111b0e368aa80366bd8382cd814ee6.tar MultiMC-ecc80bd763111b0e368aa80366bd8382cd814ee6.tar.gz MultiMC-ecc80bd763111b0e368aa80366bd8382cd814ee6.tar.lz MultiMC-ecc80bd763111b0e368aa80366bd8382cd814ee6.tar.xz MultiMC-ecc80bd763111b0e368aa80366bd8382cd814ee6.zip | |
Change the native extraction/loading logic.
Diffstat (limited to 'depends/launcher')
| -rw-r--r-- | depends/launcher/org/multimc/onesix/OneSixLauncher.java | 5 |
1 files changed, 3 insertions, 2 deletions
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<String> allNativePaths = new ArrayList<String>(); 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 { |