From 27a6c5883f506d38a3be2d4e4467f3a02152ea72 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Sat, 19 Jun 2021 09:06:22 -0400
Subject: [PATCH] make it possible to use JavaFX in Tools/Modes, other minor
 cleanups

---
 build/windows/config.xml | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/build/windows/config.xml b/build/windows/config.xml
index e9cd8be17..713338c2b 100755
--- a/build/windows/config.xml
+++ b/build/windows/config.xml
@@ -15,24 +15,38 @@
   <icon>application.ico</icon>
   <classPath>
     <mainClass>processing.app.Base</mainClass>
-    <cp>lib/pde.jar</cp>
     <cp>core/library/core.jar</cp>
+
+    <cp>lib/pde.jar</cp>
     <cp>lib/jna.jar</cp>
     <cp>lib/jna-platform.jar</cp>
-    <cp>lib/antlr-4.7.2-complete.jar</cp>
     <cp>lib/ant.jar</cp>
     <cp>lib/ant-launcher.jar</cp>
+
+    <cp>core/library/javafx.base.jar</cp>    
+    <cp>core/library/javafx.controls.jar</cp>    
+    <cp>core/library/javafx.fxml.jar</cp>    
+    <cp>core/library/javafx.graphics.jar</cp>    
+    <cp>core/library/javafx.media.jar</cp>    
+    <cp>core/library/javafx.swing.jar</cp>    
     <!-- <cp>%EXEDIR%/java/lib/tools.jar</cp> -->
   </classPath>
   <jre>
     <path>java</path>
+    <!-- Make it possible access JavaFX and JOGL libraries for Tools,
+         Modes, etc. Not recommended, but making it possible because 
+         some Tools rely on JavaFX. (OpenGL is only incidental.) -->
+    <opt>-Djava.library.path=lib;core/library</opt>
+    <opt>--module-path=core/library</opt>
+
+    <!-- Java 9+ handles high DPI internally so OS display scaling -->
+    <!-- can cause display issues with custom rendering swing elements. -->
+    <opt>-Dsun.java2d.uiScale.enabled=true</opt>
+
     <!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
     <!-- <opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt> -->
     <!-- https://github.com/processing/processing/issues/2239 -->
     <opt>-Djna.nosys=true</opt>
-    <!-- Java 9+ handles high DPI internally so OS display scaling -->
-    <!-- can cause display issues with custom rendering swing elements. -->
-    <opt>-Dsun.java2d.uiScale.enabled=false</opt>
     <!-- Because nosys is set to true, the DLL in the current working
 	 directory won't be considered. And we can't specify the user's
 	 directory here because that'll get us into encoding trouble.
@@ -42,14 +56,16 @@
 	 directory of processing.exe (the current working directory). -->
     <opt>-Djna.boot.library.path=lib</opt>
     <opt>-Djna.nounpack=true</opt>
+
     <!-- Attempt to fix UI rendering issues in Windows 10
          https://github.com/processing/processing/issues/4700 -->
     <opt>-Dsun.java2d.d3d=false</opt>
     <opt>-Dsun.java2d.ddoffscreen=false</opt>
     <opt>-Dsun.java2d.noddraw=true</opt>
-    <!-- starting in 3.0, require Java 8 -->
-    <minVersion>1.8.0_60</minVersion>
-    <!-- increase available per PDE X request -->
+
+    <!-- starting in 4.0, require Java 11 -->
+    <minVersion>11.0.11</minVersion>
+    <!-- increase available memory for PDE X -->
     <maxHeapSize>512</maxHeapSize>
   </jre>
   <splash>