--- old/buildSrc/x86egl.gradle	2014-06-20 13:06:11.733446575 -0400
+++ new/buildSrc/x86egl.gradle	2014-06-20 13:06:11.473445285 -0400
@@ -55,6 +55,9 @@
     compilerPrefix=""
 }
 
+def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
+def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+
 // Declare whether this particular target file applies to the current system
 X86EGL.canBuild = (IS_LINUX || IS_MAC) && compilerHome.exists()
 if (!X86EGL.canBuild) {
@@ -72,12 +75,15 @@
 X86EGL.compileMediaNative = false;
 
 X86EGL.includeLens = true
+X86EGL.includeMonocle = true
 X86EGL.includeNull3d = true
 X86EGL.includeEGL = true
 X86EGL.includeSwing = false
 X86EGL.includeSWT = false
 X86EGL.includeGTK = true
 
+X86EGL.javafxPlatformDefault="monocle"
+
 // Libraries end up in the sdk/rt/lib/[i386|amd46] directory depending on machine arch
 if (rootProject.hasProperty("X86EGL_ARCH")) {
     X86EGL.arch = X86EGL_ARCH
@@ -167,7 +173,25 @@
         }
 )
 
-X86EGL.javafxPlatformProperties ="""javafx.platform=monocle
+def monoclePlatformAdditions = """
+monocle.glass.platform=Monocle
+monocle.prism.order=es2,sw
+monocle.prism.eglfb=true
+monocle.prism.lcdtext=false
+monocle.prism.maxvram=128m
+monocle.prism.targetvram=112m
+monocle.use.egl=true
+monocle.use.gles2=true
+monocle.embedded=monocle
+monocle.com.sun.javafx.isEmbedded=true
+monocle.doNativeComposite=true
+monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
+monocle.prism.glDepthSize=0
+monocle.com.sun.javafx.gestures.zoom=true
+monocle.com.sun.javafx.gestures.rotate=true
+monocle.com.sun.javafx.gestures.scroll=true"""
+
+def lensPlatformAdditions = """
 directfb.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 directfb.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -187,12 +211,15 @@
 eglfb.prism.order=es2
 eglfb.prism.eglfb=true
 eglfb.prism.lcdtext=false
+eglfb.prism.maxvram=128m
+eglfb.prism.targetvram=112m
 eglfb.use.egl=true
 eglfb.use.gles2=true
 eglfb.embedded=eglfb
 eglfb.com.sun.javafx.isEmbedded=true
 eglfb.doNativeComposite=true
 eglfb.com.sun.javafx.scene.control.skin.FXVK.cache=true
+eglfb.prism.glDepthSize=0
 eglfb.com.sun.javafx.gestures.zoom=true
 eglfb.com.sun.javafx.gestures.rotate=true
 eglfb.com.sun.javafx.gestures.scroll=true
@@ -208,22 +235,6 @@
 fb.com.sun.javafx.gestures.zoom=true
 fb.com.sun.javafx.gestures.rotate=true
 fb.com.sun.javafx.gestures.scroll=true
-monocle.glass.platform=Monocle
-monocle.prism.order=es2,sw
-monocle.prism.eglfb=true
-monocle.prism.lcdtext=false
-monocle.prism.maxvram=128m
-monocle.prism.targetvram=112m
-monocle.use.egl=true
-monocle.use.gles2=true
-monocle.embedded=monocle
-monocle.com.sun.javafx.isEmbedded=true
-monocle.doNativeComposite=true
-monocle.com.sun.javafx.scene.control.skin.FXVK.cache=true
-monocle.com.sun.javafx.gestures.zoom=true
-monocle.com.sun.javafx.gestures.rotate=true
-monocle.com.sun.javafx.gestures.scroll=true
-monocle.prism.glDepthSize=0
 eglx11.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 eglx11.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -232,14 +243,19 @@
 eglx11.prism.order=es2
 eglx11.prism.eglx11=true
 eglx11.prism.lcdtext=false
+eglx11.prism.maxvram=128m
+eglx11.prism.targetvram=112m
 eglx11.use.egl=true
 eglx11.use.gles2=true
 eglx11.embedded=eglx11
 eglx11.com.sun.javafx.isEmbedded=true
 eglx11.com.sun.javafx.scene.control.skin.FXVK.cache=true
+eglx11.prism.glDepthSize=0
 eglx11.com.sun.javafx.gestures.zoom=true
 eglx11.com.sun.javafx.gestures.rotate=true
-eglx11.com.sun.javafx.gestures.scroll=true
+eglx11.com.sun.javafx.gestures.scroll=true"""
+
+def gtkPlatformAdditions = """
 gtk.com.sun.javafx.scene.control.skin.ListViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TreeViewSkin.pannable=true
 gtk.com.sun.javafx.scene.control.skin.TableViewSkin.pannable=true
@@ -300,20 +316,35 @@
     }
 )
 
-def compiler = file("$compilerHome/bin/${compilerPrefix}gcc").getAbsolutePath()
-def linker = file("$compilerHome/bin/${compilerPrefix}g++").getAbsolutePath()
+X86EGL.javafxPlatformProperties = "javafx.platform=${X86EGL.javafxPlatformDefault}"
 
 X86EGL.glass = [:]
-X86EGL.glass.variants = ["eglfb", "directfb", "fb", "gtk", "lensport", "monocle", "monocle_x11"]
 X86EGL.glass.javahInclude = [
     "com/sun/glass/events/**",
-    "com/sun/glass/ui/*",
-    "com/sun/glass/ui/lens/*",
-    "com/sun/glass/ui/monocle/*",
-    "com/sun/glass/ui/monocle/linux/*",
-    "com/sun/glass/ui/monocle/util/*",
-    "com/sun/glass/ui/monocle/x11/*",
-    "com/sun/glass/ui/gtk/*"]
+    "com/sun/glass/ui/*"]
+X86EGL.glass.variants = [ ]
+if (X86EGL.includeLens) { 
+    X86EGL.glass.variants.addAll("eglfb", "directfb", "fb", "lensport" );
+    X86EGL.glass.javahInclude.addAll("com/sun/glass/ui/lens/*");
+    X86EGL.javafxPlatformProperties = X86EGL.javafxPlatformProperties + lensPlatformAdditions
+}
+if (X86EGL.includeMonocle) { 
+    X86EGL.glass.variants.addAll("monocle", "monocle_x11");
+    X86EGL.glass.javahInclude.addAll(
+        "com/sun/glass/ui/monocle/*",
+        "com/sun/glass/ui/monocle/dispman/*",
+        "com/sun/glass/ui/monocle/mx6/*",
+        "com/sun/glass/ui/monocle/linux/*",
+        "com/sun/glass/ui/monocle/util/*",
+        "com/sun/glass/ui/monocle/x11/*");
+    X86EGL.javafxPlatformProperties = X86EGL.javafxPlatformProperties + monoclePlatformAdditions
+}
+if (X86EGL.includeGTK) {
+    X86EGL.glass.variants.addAll("gtk");
+    X86EGL.glass.javahInclude.addAll("com/sun/glass/ui/gtk/*");
+    X86EGL.javafxPlatformProperties = X86EGL.javafxPlatformProperties + gtkPlatformAdditions
+}
+
 X86EGL.glass.lib = "glass"
 
 X86EGL.glass.monocle = [:]