| | } |
| | |
| | -String targetOs |
| | - |
| | -if (binding.hasVariable('targetOs') && "windows".equals(targetOs)) { |
| | - targetOs = "win" |
| | -} else { |
| | - targetOs = "linux" |
| | - |
| | - def os = DefaultNativePlatform.currentOperatingSystem |
| | +// Assume an überjar unless targetOs is set. |
| | +String[] os = ["win", "mac", "linux"] |
| | |
| | - if (os.isMacOsX()) { |
| | - targetOs = "mac" |
| | - } else if (os.isWindows()) { |
| | - targetOs = "win" |
| | +if (project.hasProperty('targetOs')) { |
| | + if ("windows".equals(targetOs)) { |
| | + os = ["win"] |
| | + } |
| | + else { |
| | + os = [targetOs] |
| | } |
| | } |
 |
| | |
| | fx.each { fxitem -> |
| | - runtimeOnly "org.openjfx:javafx-${fxitem}:${javafx.version}:${targetOs}" |
| | + os.each { ositem -> |
| | + runtimeOnly "org.openjfx:javafx-${fxitem}:${javafx.version}:${ositem}" |
| | + } |
| | } |
| | |