64 files changed, 8 insertions, 4 deletions

diff --git a/lib/openjfx/api-ms-win-core-console-l1-1-0.dll b/lib/openjfx/api-ms-win-core-console-l1-1-0.dll
new file mode 100644
index 0000000..acd04c6
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-console-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-console-l1-2-0.dll b/lib/openjfx/api-ms-win-core-console-l1-2-0.dll
new file mode 100644
index 0000000..d16a2cc
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-console-l1-2-0.dll
diff --git a/lib/openjfx/api-ms-win-core-datetime-l1-1-0.dll b/lib/openjfx/api-ms-win-core-datetime-l1-1-0.dll
new file mode 100644
index 0000000..074cfe9
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-datetime-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-debug-l1-1-0.dll b/lib/openjfx/api-ms-win-core-debug-l1-1-0.dll
new file mode 100644
index 0000000..7d7629f
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-debug-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-errorhandling-l1-1-0.dll b/lib/openjfx/api-ms-win-core-errorhandling-l1-1-0.dll
new file mode 100644
index 0000000..bb02242
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-errorhandling-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-file-l1-1-0.dll b/lib/openjfx/api-ms-win-core-file-l1-1-0.dll
new file mode 100644
index 0000000..443200c
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-file-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-file-l1-2-0.dll b/lib/openjfx/api-ms-win-core-file-l1-2-0.dll
new file mode 100644
index 0000000..97a0097
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-file-l1-2-0.dll
diff --git a/lib/openjfx/api-ms-win-core-file-l2-1-0.dll b/lib/openjfx/api-ms-win-core-file-l2-1-0.dll
new file mode 100644
index 0000000..97c4da2
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-file-l2-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-handle-l1-1-0.dll b/lib/openjfx/api-ms-win-core-handle-l1-1-0.dll
new file mode 100644
index 0000000..825650c
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-handle-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-heap-l1-1-0.dll b/lib/openjfx/api-ms-win-core-heap-l1-1-0.dll
new file mode 100644
index 0000000..61f6db9
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-heap-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-interlocked-l1-1-0.dll b/lib/openjfx/api-ms-win-core-interlocked-l1-1-0.dll
new file mode 100644
index 0000000..e8b1f81
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-interlocked-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-libraryloader-l1-1-0.dll b/lib/openjfx/api-ms-win-core-libraryloader-l1-1-0.dll
new file mode 100644
index 0000000..c895394
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-libraryloader-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-localization-l1-2-0.dll b/lib/openjfx/api-ms-win-core-localization-l1-2-0.dll
new file mode 100644
index 0000000..6a8cdf3
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-localization-l1-2-0.dll
diff --git a/lib/openjfx/api-ms-win-core-memory-l1-1-0.dll b/lib/openjfx/api-ms-win-core-memory-l1-1-0.dll
new file mode 100644
index 0000000..4f084c2
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-memory-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-namedpipe-l1-1-0.dll b/lib/openjfx/api-ms-win-core-namedpipe-l1-1-0.dll
new file mode 100644
index 0000000..8657870
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-namedpipe-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-processenvironment-l1-1-0.dll b/lib/openjfx/api-ms-win-core-processenvironment-l1-1-0.dll
new file mode 100644
index 0000000..8cb1491
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-processenvironment-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-processthreads-l1-1-0.dll b/lib/openjfx/api-ms-win-core-processthreads-l1-1-0.dll
new file mode 100644
index 0000000..83ffbbf
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-processthreads-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-processthreads-l1-1-1.dll b/lib/openjfx/api-ms-win-core-processthreads-l1-1-1.dll
new file mode 100644
index 0000000..f129357
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-processthreads-l1-1-1.dll
diff --git a/lib/openjfx/api-ms-win-core-profile-l1-1-0.dll b/lib/openjfx/api-ms-win-core-profile-l1-1-0.dll
new file mode 100644
index 0000000..2f74dc2
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-profile-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-rtlsupport-l1-1-0.dll b/lib/openjfx/api-ms-win-core-rtlsupport-l1-1-0.dll
new file mode 100644
index 0000000..ceb4c0d
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-rtlsupport-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-string-l1-1-0.dll b/lib/openjfx/api-ms-win-core-string-l1-1-0.dll
new file mode 100644
index 0000000..5a6eca6
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-string-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-synch-l1-1-0.dll b/lib/openjfx/api-ms-win-core-synch-l1-1-0.dll
new file mode 100644
index 0000000..fcab465
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-synch-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-synch-l1-2-0.dll b/lib/openjfx/api-ms-win-core-synch-l1-2-0.dll
new file mode 100644
index 0000000..44d4ea0
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-synch-l1-2-0.dll
diff --git a/lib/openjfx/api-ms-win-core-sysinfo-l1-1-0.dll b/lib/openjfx/api-ms-win-core-sysinfo-l1-1-0.dll
new file mode 100644
index 0000000..1ac01dd
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-sysinfo-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-timezone-l1-1-0.dll b/lib/openjfx/api-ms-win-core-timezone-l1-1-0.dll
new file mode 100644
index 0000000..944bada
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-timezone-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-core-util-l1-1-0.dll b/lib/openjfx/api-ms-win-core-util-l1-1-0.dll
new file mode 100644
index 0000000..41b1019
--- /dev/null
+++ b/lib/openjfx/api-ms-win-core-util-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-conio-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-conio-l1-1-0.dll
new file mode 100644
index 0000000..c45f2e5
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-conio-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-convert-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-convert-l1-1-0.dll
new file mode 100644
index 0000000..d26ff06
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-convert-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-environment-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-environment-l1-1-0.dll
new file mode 100644
index 0000000..814effa
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-environment-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-filesystem-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-filesystem-l1-1-0.dll
new file mode 100644
index 0000000..94bd00b
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-filesystem-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-heap-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-heap-l1-1-0.dll
new file mode 100644
index 0000000..afe8a06
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-heap-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-locale-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-locale-l1-1-0.dll
new file mode 100644
index 0000000..4c078b3
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-locale-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-math-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-math-l1-1-0.dll
new file mode 100644
index 0000000..240b35e
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-math-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-multibyte-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-multibyte-l1-1-0.dll
new file mode 100644
index 0000000..f7deb09
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-multibyte-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-private-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-private-l1-1-0.dll
new file mode 100644
index 0000000..b9af7f1
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-private-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-process-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-process-l1-1-0.dll
new file mode 100644
index 0000000..3325b23
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-process-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-runtime-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-runtime-l1-1-0.dll
new file mode 100644
index 0000000..b5b1abd
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-runtime-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-stdio-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-stdio-l1-1-0.dll
new file mode 100644
index 0000000..8dc9e22
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-stdio-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-string-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-string-l1-1-0.dll
new file mode 100644
index 0000000..6ba75fe
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-string-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-time-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-time-l1-1-0.dll
new file mode 100644
index 0000000..9488453
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-time-l1-1-0.dll
diff --git a/lib/openjfx/api-ms-win-crt-utility-l1-1-0.dll b/lib/openjfx/api-ms-win-crt-utility-l1-1-0.dll
new file mode 100644
index 0000000..07f203b
--- /dev/null
+++ b/lib/openjfx/api-ms-win-crt-utility-l1-1-0.dll
diff --git a/lib/openjfx/decora_sse.dll b/lib/openjfx/decora_sse.dll
new file mode 100644
index 0000000..18b1c74
--- /dev/null
+++ b/lib/openjfx/decora_sse.dll
diff --git a/lib/openjfx/glass.dll b/lib/openjfx/glass.dll
new file mode 100644
index 0000000..f9e8433
--- /dev/null
+++ b/lib/openjfx/glass.dll
diff --git a/lib/openjfx/javafx-swt.jar b/lib/openjfx/javafx-swt.jar
deleted file mode 100644
index 26a972f..0000000
--- a/lib/openjfx/javafx-swt.jar
+++ /dev/null
diff --git a/lib/openjfx/javafx.base.jar b/lib/openjfx/javafx.base.jar
index 855e125..490b5f2 100644
--- a/lib/openjfx/javafx.base.jar
+++ b/lib/openjfx/javafx.base.jar
diff --git a/lib/openjfx/javafx.controls.jar b/lib/openjfx/javafx.controls.jar
index a0c2d31..4380a62 100644
--- a/lib/openjfx/javafx.controls.jar
+++ b/lib/openjfx/javafx.controls.jar
diff --git a/lib/openjfx/javafx.fxml.jar b/lib/openjfx/javafx.fxml.jar
index c3b66e5..b12a6d1 100644
--- a/lib/openjfx/javafx.fxml.jar
+++ b/lib/openjfx/javafx.fxml.jar
diff --git a/lib/openjfx/javafx.graphics.jar b/lib/openjfx/javafx.graphics.jar
index 945b80f..9e88553 100644
--- a/lib/openjfx/javafx.graphics.jar
+++ b/lib/openjfx/javafx.graphics.jar
diff --git a/lib/openjfx/javafx.media.jar b/lib/openjfx/javafx.media.jar
deleted file mode 100644
index 584a9d2..0000000
--- a/lib/openjfx/javafx.media.jar
+++ /dev/null
diff --git a/lib/openjfx/javafx.properties b/lib/openjfx/javafx.properties
index bfea014..daa5bed 100644
--- a/lib/openjfx/javafx.properties
+++ b/lib/openjfx/javafx.properties
@@ -1,3 +1,3 @@
-javafx.version=22.0.2
-javafx.runtime.version=22.0.2+4
-javafx.runtime.build=4
+javafx.version=25.0.4
+javafx.runtime.version=25.0.4+2
+javafx.runtime.build=2
diff --git a/lib/openjfx/javafx.swing.jar b/lib/openjfx/javafx.swing.jar
deleted file mode 100644
index 8f033f1..0000000
--- a/lib/openjfx/javafx.swing.jar
+++ /dev/null
diff --git a/lib/openjfx/javafx.web.jar b/lib/openjfx/javafx.web.jar
deleted file mode 100644
index 2f49524..0000000
--- a/lib/openjfx/javafx.web.jar
+++ /dev/null
diff --git a/lib/openjfx/javafx_font.dll b/lib/openjfx/javafx_font.dll
new file mode 100644
index 0000000..a8a3bcb
--- /dev/null
+++ b/lib/openjfx/javafx_font.dll
diff --git a/lib/openjfx/javafx_iio.dll b/lib/openjfx/javafx_iio.dll
new file mode 100644
index 0000000..91aecc3
--- /dev/null
+++ b/lib/openjfx/javafx_iio.dll
diff --git a/lib/openjfx/msvcp140.dll b/lib/openjfx/msvcp140.dll
new file mode 100644
index 0000000..8397a60
--- /dev/null
+++ b/lib/openjfx/msvcp140.dll
diff --git a/lib/openjfx/msvcp140_1.dll b/lib/openjfx/msvcp140_1.dll
new file mode 100644
index 0000000..fc8f1e5
--- /dev/null
+++ b/lib/openjfx/msvcp140_1.dll
diff --git a/lib/openjfx/msvcp140_2.dll b/lib/openjfx/msvcp140_2.dll
new file mode 100644
index 0000000..e2dcad3
--- /dev/null
+++ b/lib/openjfx/msvcp140_2.dll
diff --git a/lib/openjfx/prism_common.dll b/lib/openjfx/prism_common.dll
new file mode 100644
index 0000000..ecad67f
--- /dev/null
+++ b/lib/openjfx/prism_common.dll
diff --git a/lib/openjfx/prism_d3d.dll b/lib/openjfx/prism_d3d.dll
new file mode 100644
index 0000000..e6cb006
--- /dev/null
+++ b/lib/openjfx/prism_d3d.dll
diff --git a/lib/openjfx/prism_sw.dll b/lib/openjfx/prism_sw.dll
new file mode 100644
index 0000000..bb231a9
--- /dev/null
+++ b/lib/openjfx/prism_sw.dll
diff --git a/lib/openjfx/ucrtbase.dll b/lib/openjfx/ucrtbase.dll
new file mode 100644
index 0000000..47961e9
--- /dev/null
+++ b/lib/openjfx/ucrtbase.dll
diff --git a/lib/openjfx/vcruntime140.dll b/lib/openjfx/vcruntime140.dll
new file mode 100644
index 0000000..411009b
--- /dev/null
+++ b/lib/openjfx/vcruntime140.dll
diff --git a/lib/openjfx/vcruntime140_1.dll b/lib/openjfx/vcruntime140_1.dll
new file mode 100644
index 0000000..2071f28
--- /dev/null
+++ b/lib/openjfx/vcruntime140_1.dll
diff --git a/tools/package.sh b/tools/package.sh
index 186dab5..ce18f63 100644
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -19,6 +19,10 @@ for d in $RUNTIME_LIB_DIRS; do
     cp "$j" "$DIST/lib/$d/"
     n=$((n + 1))
   done
+  for dll in lib/"$d"/*.dll; do
+    [ -f "$dll" ] || continue # e.g. openjfx's native Prism/Glass libraries
+    cp "$dll" "$DIST/lib/$d/"
+  done
   echo "  lib/$d/ ($n jars)"
 done
 
@@ -61,7 +65,7 @@ for e in $EXECUTABLES; do
   cat >"$DIST/run-${e#ui-}.bat" <<EOF
 @echo off
 cd /d "%~dp0"
-java -jar "%~dp0$e.jar"
+java -Djava.library.path="%~dp0lib\openjfx" -jar "%~dp0$e.jar"
 if errorlevel 1 pause
 EOF
 done