turn webkit back on again for javafx

This commit is contained in:
Ben Fry
2021-07-08 19:58:09 -04:00
parent 2471ab58b2
commit add4854478
3 changed files with 3 additions and 4 deletions
+1 -2
View File
@@ -583,8 +583,7 @@
<!-- Necessary to avoid complaints because JavaFX wants to be a module. -->
<option value="--module-path=$APP_ROOT/Contents/Java/modes/java/libraries/javafx/library/macosx/modules" />
<!-- TODO Still needs work, it may have only been working b/c of old libs -->
<!-- <option value="- -add-modules=javafx.base,javafx.graphics" /> -->
<option value="--add-modules=javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing,javafx.web" />
<!-- Required for video capture and microphone input
https://github.com/processing/processing-sound/issues/51
+1 -1
View File
@@ -113,5 +113,5 @@ else
fi
cd "$APPDIR"
java -splash:lib/about-1x.png -Djna.nosys=true -Djava.library.path=lib:modes/java/libraries/javafx/library/linux64 --module-path=modes/java/libraries/javafx/library/linux64/modules --add-modules=javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing -Xmx512m processing.app.Base "$SKETCH" &
java -splash:lib/about-1x.png -Djna.nosys=true -Djava.library.path=lib:modes/java/libraries/javafx/library/linux64 --module-path=modes/java/libraries/javafx/library/linux64/modules --add-modules=javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing,javafx.web -Xmx512m processing.app.Base "$SKETCH" &
fi
+1 -1
View File
@@ -45,7 +45,7 @@
but making it possible for 4.x because some Tools rely on JavaFX. -->
<opt>-Djava.library.path=lib;modes/java/libraries/javafx/library/windows64</opt>
<opt>--module-path=modes/java/libraries/javafx/library/windows64/modules</opt>
<opt>--add-modules=javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing</opt>
<opt>--add-modules=javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing,javafx.web</opt>
<!-- Java 9+ handles high DPI internally so OS display scaling -->
<!-- can cause display issues with custom rendering swing elements. -->