From 16535530bf15f9f4d6cdd3ff38132c2487f96e05 Mon Sep 17 00:00:00 2001 From: sg215889 Date: Thu, 30 Jul 2009 05:20:43 -0700 Subject: Cleanup: Remove NativeWindowFactory.TYPE_BROADCOM_EGL --- make/make.jogl.all.linux-x86.sh | 1 + .../classes/javax/media/nativewindow/NativeWindowFactory.java | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh index 0f764b360..081d8328b 100644 --- a/make/make.jogl.all.linux-x86.sh +++ b/make/make.jogl.all.linux-x86.sh @@ -14,6 +14,7 @@ fi # -DisLinux=true \ # -DisLinuxX86=true \ # -DisX11=true \ +# -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86 \ ant \ -Dbuild.noarchives=true \ diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java index d4684c783..cbd485649 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java @@ -48,9 +48,6 @@ import com.sun.nativewindow.impl.jvm.JVMUtil; public abstract class NativeWindowFactory { protected static final boolean DEBUG = Debug.debug("NativeWindow"); - /** Broadcom EGL type */ - public static final String TYPE_BROADCOM_EGL = "BroadcomEGL"; - /** OpenKODE/EGL type */ public static final String TYPE_EGL = "EGL"; @@ -85,8 +82,6 @@ public abstract class NativeWindowFactory { private static String _getNativeWindowingType(String osNameLowerCase) { if (osNameLowerCase.startsWith("kd")) { return TYPE_EGL; - } else if (osNameLowerCase.startsWith(TYPE_BROADCOM_EGL.toLowerCase())) { - return TYPE_BROADCOM_EGL; } else if (osNameLowerCase.startsWith("wind")) { return TYPE_WINDOWS; } else if (osNameLowerCase.startsWith("mac os x") || -- cgit v1.2.3