Only initialize Controller on win32
This commit is contained in:
parent
742559fe20
commit
7ecf2516fb
|
@ -107,6 +107,8 @@ public final class Display {
|
||||||
class_name = "org.lwjgl.opengl.LinuxDisplay";
|
class_name = "org.lwjgl.opengl.LinuxDisplay";
|
||||||
} else if (os_name.startsWith("Windows")) {
|
} else if (os_name.startsWith("Windows")) {
|
||||||
class_name = "org.lwjgl.opengl.Win32Display";
|
class_name = "org.lwjgl.opengl.Win32Display";
|
||||||
|
} else if (os_name.startsWith("Mac")) {
|
||||||
|
class_name = "org.lwjgl.opengl.MacOSXDisplay";
|
||||||
} else
|
} else
|
||||||
throw new IllegalStateException("The platform " + os_name + " is not supported");
|
throw new IllegalStateException("The platform " + os_name + " is not supported");
|
||||||
try {
|
try {
|
||||||
|
@ -577,7 +579,7 @@ public final class Display {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!Controller.isCreated() && !Boolean.getBoolean("org.lwjgl.opengl.Display.nocontroller")) {
|
if (System.getProperty("os.name").startsWith("Win") && !Controller.isCreated() && !Boolean.getBoolean("org.lwjgl.opengl.Display.nocontroller")) {
|
||||||
try {
|
try {
|
||||||
Controller.create();
|
Controller.create();
|
||||||
} catch (LWJGLException e) {
|
} catch (LWJGLException e) {
|
||||||
|
|
Loading…
Reference in New Issue