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

define 2 new Platform values for Linux ARM, register BulletJme lib paths (#1182)

Browse Source
This commit is contained in:
Stephen Gold 2019-09-18 20:50:45 -07:00 committed by GitHub
parent 126874873c
commit 3e89cd1377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jme3-core/src/main/java/com/jme3/system/JmeSystemDelegate.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2012 jMonkeyEngine * Copyright (c) 2009-2019 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -169,8 +169,13 @@ public abstract class JmeSystemDelegate {
boolean is64 = is64Bit(arch); boolean is64 = is64Bit(arch);
if (os.contains("windows")) { if (os.contains("windows")) {
return is64 ? Platform.Windows64 : Platform.Windows32; return is64 ? Platform.Windows64 : Platform.Windows32;
} else if (os.contains("linux") || os.contains("freebsd") || os.contains("sunos")) { } else if (os.contains("linux") || os.contains("freebsd")
|| os.contains("sunos") || os.contains("unix")) {
if (arch.startsWith("arm")) {
return is64 ? Platform.Linux_ARM64 : Platform.Linux_ARM32;
} else {
return is64 ? Platform.Linux64 : Platform.Linux32; return is64 ? Platform.Linux64 : Platform.Linux32;
}
} else if (os.contains("mac os x") || os.contains("darwin")) { } else if (os.contains("mac os x") || os.contains("darwin")) {
if (arch.startsWith("ppc")) { if (arch.startsWith("ppc")) {
return is64 ? Platform.MacOSX_PPC64 : Platform.MacOSX_PPC32; return is64 ? Platform.MacOSX_PPC64 : Platform.MacOSX_PPC32;

20
jme3-core/src/main/java/com/jme3/system/Platform.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2012 jMonkeyEngine * Copyright (c) 2009-2019 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -44,22 +44,32 @@ public enum Platform {
Windows64(true), Windows64(true),
/** /**
* Linux 32 bit * Linux 32-bit Intel
*/ */
Linux32, Linux32,
/** /**
* Linux 64 bit * Linux 64-bit Intel
*/ */
Linux64(true), Linux64(true),
/** /**
* Apple Mac OS X 32 bit * Linux 32-bit ARM
*/
Linux_ARM32,
/**
* Linux 64-bit ARM
*/
Linux_ARM64(true),
/**
* Apple Mac OS X 32-bit Intel
*/ */
MacOSX32, MacOSX32,
/** /**
* Apple Mac OS X 64 bit * Apple Mac OS X 64-bit Intel
*/ */
MacOSX64(true), MacOSX64(true),

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2012 jMonkeyEngine * Copyright (c) 2009-2019 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -175,6 +175,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.Linux_ARM32, "native/linux/arm32/libbulletjme.so");
registerNativeLibrary("bulletjme", Platform.Linux_ARM64, "native/linux/arm64/libbulletjme.so");
registerNativeLibrary("bulletjme", Platform.MacOSX32, "native/osx/x86/libbulletjme.dylib"); registerNativeLibrary("bulletjme", Platform.MacOSX32, "native/osx/x86/libbulletjme.dylib");
registerNativeLibrary("bulletjme", Platform.MacOSX64, "native/osx/x86_64/libbulletjme.dylib"); registerNativeLibrary("bulletjme", Platform.MacOSX64, "native/osx/x86_64/libbulletjme.dylib");