Skip to content

Commit 6e65c05

Browse files
8Keep8Keep
committed
Remove Linux 32-bit support
1 parent 3c5dc72 commit 6e65c05

6 files changed

Lines changed: 21 additions & 40 deletions

File tree

‎jme3-core/src/main/java/com/jme3/system/JmeSystemDelegate.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,17 @@ public Platform getPlatform() {
261261
}
262262
} else if (os.contains("linux") || os.contains("freebsd")
263263
|| os.contains("sunos") || os.contains("unix")) {
264-
if (arch.startsWith("arm") || arch.startsWith("aarch")) {
265-
return is64 ? Platform.Linux_ARM64 : Platform.Linux_ARM32;
266-
} else {
267-
return is64 ? Platform.Linux64 : Platform.Linux32;
268-
}
264+
if (arch.startsWith("arm") || arch.startsWith("aarch")) {
265+
if (!is64) {
266+
throw new UnsupportedOperationException("32-bit Linux is not supported.");
267+
}
268+
return Platform.Linux_ARM64;
269+
} else {
270+
if (!is64) {
271+
throw new UnsupportedOperationException("32-bit Linux is not supported.");
272+
}
273+
return Platform.Linux64;
274+
}
269275
} else if (os.contains("mac os x") || os.contains("darwin")) {
270276
if (arch.startsWith("ppc")) {
271277
if (!is64) {

‎jme3-core/src/main/java/com/jme3/system/Platform.java‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,14 @@ public enum Platform {
4646
*/
4747
Windows_ARM64(Os.Windows, true),
4848

49-
/**
50-
* Linux 32-bit Intel
51-
*/
52-
Linux32(Os.Linux),
53-
54-
/**
55-
* Linux 64-bit Intel
56-
*/
57-
Linux64(Os.Linux, true),
58-
59-
/**
60-
* Linux 32-bit ARM
61-
*/
62-
Linux_ARM32(Os.Linux),
63-
64-
/**
65-
* Linux 64-bit ARM
66-
*/
49+
/**
50+
* Linux 64-bit Intel
51+
*/
52+
Linux64(Os.Linux, true),
53+
54+
/**
55+
* Linux 64-bit ARM
56+
*/
6757
Linux_ARM64(Os.Linux, true),
6858

6959
/**

‎jme3-desktop/src/main/java/com/jme3/system/ExtractNativeLibraries.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static void main(String[] args) {
6060
}
6161
if (args.length < 2) {
6262
System.err.println("Usage: ExtractNativeLibraries Platform ExtractionPath");
63-
System.err.println("Where 'Platform' is either Windows64, Linux32, Linux64, or MacOSX64");
63+
System.err.println("Where 'Platform' is either Windows64, Linux64, or MacOSX64");
6464
System.err.println("'ExtractionPath' is a folder to extract the binaries to.");
6565
System.err.println("You can also use ExtractNativeLibraries getjarexcludes to get a list of excludes for the jar files that contain binaries.");
6666
System.exit(1);
@@ -70,14 +70,12 @@ public static void main(String[] args) {
7070
try {
7171
if ("Windows64".equals(args[0])) {
7272
NativeLibraryLoader.extractNativeLibraries(Platform.Windows64, folder);
73-
} else if ("Linux32".equals(args[0])) {
74-
NativeLibraryLoader.extractNativeLibraries(Platform.Linux32, folder);
7573
} else if ("Linux64".equals(args[0])) {
7674
NativeLibraryLoader.extractNativeLibraries(Platform.Linux64, folder);
7775
} else if ("MacOSX64".equals(args[0])) {
7876
NativeLibraryLoader.extractNativeLibraries(Platform.MacOSX64, folder);
7977
} else {
80-
System.err.println("Please specify a platform, Windows64, Linux32, Linux64, or MacOSX64");
78+
System.err.println("Please specify a platform, Windows64, Linux64, or MacOSX64");
8179
System.exit(3);
8280
}
8381
} catch (IOException ex) {

‎jme3-desktop/src/main/java/com/jme3/system/NativeLibraries.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public enum NativeLibraries {
5555
System.setProperty("org.lwjgl.librarypath",
5656
Paths.get(libPath).getParent().toAbsolutePath().toString()))
5757
.addNativeVariant(Platform.Windows64, "lwjgl64.dll")
58-
.addNativeVariant(Platform.Linux32, "liblwjgl.so")
5958
.addNativeVariant(Platform.Linux64, "liblwjgl64.so")
6059
.addNativeVariant(Platform.MacOSX64, "liblwjgl.dylib")
6160
),
@@ -67,7 +66,6 @@ public enum NativeLibraries {
6766
*/
6867
OpenAL(new LibraryInfo("openal")
6968
.addNativeVariant(Platform.Windows64, "OpenAL64.dll")
70-
.addNativeVariant(Platform.Linux32, "libopenal.so")
7169
.addNativeVariant(Platform.Linux64, "libopenal64.so")
7270
.addNativeVariant(Platform.MacOSX64, "openal.dylib", "libopenal.dylib")
7371
),
@@ -78,9 +76,7 @@ public enum NativeLibraries {
7876
BulletJme(new LibraryInfo("bulletjme")
7977
.addNativeVariant(Platform.Windows64, "native/windows/x86_64/bulletjme.dll", "bulletjme-x86_64.dll")
8078
.addNativeVariant(Platform.Windows_ARM64, "native/windows/arm64/bulletjme.dll", "bulletjme-arm64.dll")
81-
.addNativeVariant(Platform.Linux32, "native/linux/x86/libbulletjme.so", "libbulletjme-x86.so")
8279
.addNativeVariant(Platform.Linux64, "native/linux/x86_64/libbulletjme.so", "libbulletjme-x86_64.so")
83-
.addNativeVariant(Platform.Linux_ARM32, "native/linux/arm32/libbulletjme.so", "libbulletjme-arm32.so")
8480
.addNativeVariant(Platform.Linux_ARM64, "native/linux/arm64/libbulletjme.so", "libbulletjme-arm64.so")
8581
.addNativeVariant(Platform.MacOSX64, "native/osx/x86_64/libbulletjme.dylib", "libbulletjme-x86_64.dylib")
8682
.addNativeVariant(Platform.MacOSX_ARM64, "native/osx/arm64/libbulletjme.dylib", "libbulletjme-arm64.dylib")
@@ -95,7 +91,6 @@ public enum NativeLibraries {
9591
System.setProperty("net.java.games.input.librarypath",
9692
Paths.get(libPath).getParent().toAbsolutePath().toString()))
9793
.addNativeVariant(Platform.Windows64, "jinput-raw_64.dll")
98-
.addNativeVariant(Platform.Linux32, "libjinput-linux.so")
9994
.addNativeVariant(Platform.Linux64, "libjinput-linux64.so")
10095
.addNativeVariant(Platform.MacOSX64, "libjinput-osx.jnilib", "libjinput-osx.dylib")
10196
),
@@ -106,7 +101,6 @@ public enum NativeLibraries {
106101
*/
107102
JInputDX8(new LibraryInfo("jinput-dx8")
108103
.addNativeVariant(Platform.Windows64, "jinput-dx8_64.dll", null)
109-
.addNativeVariant(Platform.Linux32, null)
110104
.addNativeVariant(Platform.Linux64, null)
111105
.addNativeVariant(Platform.MacOSX64, null)
112106
);

‎jme3-desktop/src/main/java/com/jme3/system/NativeLibraryLoader.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
* Example:<br>
5858
* <pre>
5959
* NativeLibraryLoader.registerNativeLibrary("mystuff", Platform.Windows64, "native/windows/mystuff64.dll");
60-
* NativeLibraryLoader.registerNativeLibrary("mystuff", Platform.Linux32, "native/linux/libmystuff.so");
6160
* NativeLibraryLoader.registerNativeLibrary("mystuff", Platform.Linux64, "native/linux/libmystuff64.so");
6261
* NativeLibraryLoader.registerNativeLibrary("mystuff", Platform.MacOSX64, "native/macosx/libmystuff.jnilib");
6362
* </pre>

‎jme3-lwjgl3/build.gradle‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,42 +16,36 @@ dependencies {
1616

1717
runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-windows') })
1818
runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-linux') })
19-
runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-linux-arm32') })
2019
runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-linux-arm64') })
2120
runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-macos') })
2221
runtimeOnly(variantOf(libs.lwjgl3.base){ classifier('natives-macos-arm64') })
2322

2423
runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-windows') })
2524
runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-linux') })
26-
runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-linux-arm32') })
2725
runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-linux-arm64') })
2826
runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-macos') })
2927
runtimeOnly(variantOf(libs.lwjgl3.glfw){ classifier('natives-macos-arm64') })
3028

3129
runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-windows') })
3230
runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-linux') })
33-
runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-linux-arm32') })
3431
runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-linux-arm64') })
3532
runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-macos') })
3633
runtimeOnly(variantOf(libs.lwjgl3.jemalloc){ classifier('natives-macos-arm64') })
3734

3835
runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-windows') })
3936
runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-linux') })
40-
runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-linux-arm32') })
4137
runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-linux-arm64') })
4238
runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-macos') })
4339
runtimeOnly(variantOf(libs.lwjgl3.opengl){ classifier('natives-macos-arm64') })
4440

4541
runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-windows') })
4642
runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-linux') })
47-
runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-linux-arm32') })
4843
runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-linux-arm64') })
4944
runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-macos') })
5045
runtimeOnly(variantOf(libs.lwjgl3.openal){ classifier('natives-macos-arm64') })
5146

5247
runtimeOnly(variantOf(libs.lwjgl3.sdl){ classifier('natives-windows') })
5348
runtimeOnly(variantOf(libs.lwjgl3.sdl){ classifier('natives-linux') })
54-
runtimeOnly(variantOf(libs.lwjgl3.sdl){ classifier('natives-linux-arm32') })
5549
runtimeOnly(variantOf(libs.lwjgl3.sdl){ classifier('natives-linux-arm64') })
5650
runtimeOnly(variantOf(libs.lwjgl3.sdl){ classifier('natives-macos') })
5751
runtimeOnly(variantOf(libs.lwjgl3.sdl){ classifier('natives-macos-arm64') })

0 commit comments

Comments
 (0)