sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix NativeLibraryLoader using deprecated Natives class for hash generation

Browse Source 
- fix bullet native file name for OSX
This commit is contained in:
Normen Hansen 2015-01-13 16:10:09 +01:00
parent 31bc6bf526
commit fd78498bc8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java
View File

@ -144,8 +144,8 @@ public final class NativeLibraryLoader {
registerNativeLibrary("bulletjme", Platform.Windows64, "native/windows/x86_64/bulletjme.dll"); registerNativeLibrary("bulletjme", Platform.Windows64, "native/windows/x86_64/bulletjme.dll");
registerNativeLibrary("bulletjme", Platform.Linux32, "native/linux/x86/libbulletjme.so"); registerNativeLibrary("bulletjme", Platform.Linux32, "native/linux/x86/libbulletjme.so");
registerNativeLibrary("bulletjme", Platform.Linux64, "native/linux/x86_64/libbulletjme.so"); registerNativeLibrary("bulletjme", Platform.Linux64, "native/linux/x86_64/libbulletjme.so");
registerNativeLibrary("bulletjme", Platform.MacOSX32, "native/macosx/x86/libbulletjme.jnilib"); registerNativeLibrary("bulletjme", Platform.MacOSX32, "native/macosx/x86/libbulletjme.dylib");
registerNativeLibrary("bulletjme", Platform.MacOSX64, "native/macosx/x86_64/libbulletjme.jnilib"); registerNativeLibrary("bulletjme", Platform.MacOSX64, "native/macosx/x86_64/libbulletjme.dylib");
// JInput // JInput
registerNativeLibrary("jinput", Platform.Windows32, "native/windows/jinput-raw.dll"); registerNativeLibrary("jinput", Platform.Windows32, "native/windows/jinput-raw.dll");
@ -250,7 +250,7 @@ public final class NativeLibraryLoader {
URLConnection conn = null; URLConnection conn = null;
try { try {
String classpath = System.getProperty("java.class.path"); String classpath = System.getProperty("java.class.path");
URL url = Thread.currentThread().getContextClassLoader().getResource("com/jme3/system/Natives.class"); URL url = Thread.currentThread().getContextClassLoader().getResource("com/jme3/system/NativeLibraryLoder.class");
StringBuilder sb = new StringBuilder(url.toString()); StringBuilder sb = new StringBuilder(url.toString());
if (sb.indexOf("jar:") == 0) { if (sb.indexOf("jar:") == 0) {