buildSrc/armv6sf.gradle

*** 160,169 ****
--- 160,171 ----
  def es2CFlags = [extraCFlags].flatten()
  def es2LFlags = [extraLFlags, eglLFlags].flatten()
  
  def es2EglfbCFlags = [extraCFlags, eglCFlags, "-DIS_EGLFB", "-DLINUX"].flatten()
  def es2EglfbLFlags = [extraLFlags, eglLFlags].flatten()
+ def es2MonocleCFlags = [extraCFlags, eglCFlags, "-DIS_EGLFB", "-DLINUX"].flatten()
+ def es2MonocleFlags = [extraLFlags, eglLFlags].flatten()
  
  def es2X11CFlags = [extraCFlags, eglCFlags, x11CFlags, "-DDEBUG", "-DIS_EGLX11", "-DLINUX"].flatten()
  def es2X11LFlags = [extraLFlags, x11LFlags, eglLFlags, "-lXdmcp", "-lXau"].flatten()
  
  def prismSWCFlags = [extraCFlags].flatten()
*** 348,357 ****
--- 350,360 ----
  ARMV6SF.glass.variants = ["eglfb", "directfb", "fb", "gtk", "lensport", "monocle", "monocle_x11" ]
  ARMV6SF.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/accessible/gtk/*"]
*** 367,376 ****
--- 370,380 ----
  ARMV6SF.glass.lensport.linkFlags = [lensLFlags].flatten()
  ARMV6SF.glass.lensport.lib = "lens_porting"
  
  ARMV6SF.glass.monocle = [:]
  ARMV6SF.glass.monocle.nativeSource = [
+         file("modules/graphics/src/main/native-glass/monocle"),
          file("modules/graphics/src/main/native-glass/monocle/linux"),
          file("modules/graphics/src/main/native-glass/monocle/util") ]
  ARMV6SF.glass.monocle.compiler = compiler
  ARMV6SF.glass.monocle.ccFlags = monocleCFlags
  ARMV6SF.glass.monocle.linker = linker
*** 490,500 ****
  ARMV6SF.iio.linker = linker
  ARMV6SF.iio.linkFlags = iioLFlags
  ARMV6SF.iio.lib = "javafx_iio"
  
  ARMV6SF.prismES2 = [:]
! ARMV6SF.prismES2.variants = ["eglfb"]
  ARMV6SF.prismES2.javahInclude = ["com/sun/prism/es2/**/*"]
  
  ARMV6SF.prismES2.eglfb = [:]
  ARMV6SF.prismES2.eglfb.nativeSource = [
      file("modules/graphics/src/main/native-prism-es2"),
--- 494,504 ----
  ARMV6SF.iio.linker = linker
  ARMV6SF.iio.linkFlags = iioLFlags
  ARMV6SF.iio.lib = "javafx_iio"
  
  ARMV6SF.prismES2 = [:]
! ARMV6SF.prismES2.variants = ["eglfb", "monocle"]
  ARMV6SF.prismES2.javahInclude = ["com/sun/prism/es2/**/*"]
  
  ARMV6SF.prismES2.eglfb = [:]
  ARMV6SF.prismES2.eglfb.nativeSource = [
      file("modules/graphics/src/main/native-prism-es2"),
*** 505,514 ****
--- 509,530 ----
  ARMV6SF.prismES2.eglfb.ccFlags = [ es2EglfbCFlags, "-I", ARMV6SF.glass.lensport.nativeSource ].flatten()
  ARMV6SF.prismES2.eglfb.linker = linker
  ARMV6SF.prismES2.eglfb.linkFlags = es2EglfbLFlags
  ARMV6SF.prismES2.eglfb.lib = "prism_es2_eglfb"
  
+ ARMV6SF.prismES2.monocle= [:]
+ ARMV6SF.prismES2.monocle.nativeSource = [
+     file("modules/graphics/src/main/native-prism-es2"),
+     file("modules/graphics/src/main/native-prism-es2/GL"),
+     file("modules/graphics/src/main/native-prism-es2/monocle")
+ ]
+ ARMV6SF.prismES2.monocle.compiler = compiler
+ ARMV6SF.prismES2.monocle.ccFlags = [ es2EglfbCFlags, "-I", ARMV6SF.glass.lensport.nativeSource ].flatten()
+ ARMV6SF.prismES2.monocle.linker = linker
+ ARMV6SF.prismES2.monocle.linkFlags = es2EglfbLFlags
+ ARMV6SF.prismES2.monocle.lib = "prism_es2_monocle"
+ 
  ARMV6SF.prismES2.eglx11 = [:]
  ARMV6SF.prismES2.eglx11.nativeSource = [
      file("modules/graphics/src/main/native-prism-es2"),
      file("modules/graphics/src/main/native-prism-es2/GL"),
      file("modules/graphics/src/main/native-prism-es2/eglx11")