From 88d3eecbde4f61a431a0979d4de3da5dc75439ac Mon Sep 17 00:00:00 2001
From: "jose.pereda" <jose.pereda@gluonhq.com>
Date: Fri, 16 Apr 2021 23:20:56 +0200
Subject: [PATCH] Add related AWT libraries and use correct order when linking

---
 .../gluonhq/substrate/target/LinuxTargetConfiguration.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java
index ab66f13f..0a9832bc 100644
--- a/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java
+++ b/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java
@@ -58,7 +58,8 @@ public class LinuxTargetConfiguration extends PosixTargetConfiguration {
     private static final List<String> linuxLibs = Arrays.asList("z", "dl", "stdc++", "pthread");
 
     private static final List<String> staticJavaLibs = Arrays.asList(
-            "java", "nio", "zip", "net", "prefs", "j2pkcs11", "sunec", "extnet", "fdlibm"
+            "java", "nio", "zip", "net", "prefs", "j2pkcs11", "sunec", "extnet", "fdlibm",
+            "fontmanager", "javajpeg", "lcms", "awt_headless", "awt"
     );
 
     private static final List<String> staticJvmLibs = Arrays.asList(
@@ -194,14 +195,14 @@ List<String> getTargetSpecificLinkFlags(boolean useJavaFX, boolean usePrismSW) t
                 answer.addAll(linuxfxMedialibs);
             }
         }
-        if (projectConfiguration.getClasspath().contains("javafx-web")) {
+        if (projectConfiguration.hasWeb()) {
             answer.remove(answer.size() - 1);
             answer.addAll(linuxfxWeblibs);
         }
-        answer.addAll(LinuxLinkerFlags.getLinkerFlags());
         if (!crossCompile) {
             answer.addAll(LinuxLinkerFlags.getMediaLinkerFlags());
         }
+        answer.addAll(LinuxLinkerFlags.getLinkerFlags());
         if (usePrismSW || crossCompile) {
             answer.addAll(linuxfxSWlibs);
         }