FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

X11 wayland features on linux by catilac · Pull Request #1540 · processing/processing4 · GitHub

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .kt  (1) .kts  (1) No extension  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package processing.gradle
import org.gradle.api.DefaultTask
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property
import org.gradle.api.tasks.*
import org.gradle.process.ExecOperations
Expand All @@ -25,6 +26,9 @@ abstract class CargoBuildTask : DefaultTask() {
@get:Input
abstract val cargoPath: Property<String>

@get:Input
abstract val features: ListProperty<String>

@get:OutputFile
abstract val outputLibrary: RegularFileProperty

Expand All @@ -34,6 +38,7 @@ abstract class CargoBuildTask : DefaultTask() {

// release by default
release.convention(true)
features.convention(emptyList())
}

@TaskAction
Expand All @@ -45,9 +50,14 @@ abstract class CargoBuildTask : DefaultTask() {
if (release.get()) {
args.add("--release")
}
if (features.get().isNotEmpty()) {
args.add("--features")
args.add(features.get().joinToString(","))
}
args.add("--manifest-path")
args.add(manifestPath.get())


execOperations.exec {
workingDir = cargoWorkspaceDir.get().asFile
commandLine = listOf(cargoPath.get()) + args
Expand Down
3 changes: 3 additions & 0 deletions core/build.gradle.kts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ if (enableWebGPU) {
manifestPath.set(ffiManifestPath)
release.set(true)
cargoPath.set(PlatformUtils.getCargoPath())
if (currentPlatform.os == "linux") {
features.set(listOf("x11", "wayland"))
}
outputLibrary.set(file("$rustTargetDir/release/${currentPlatform.libName}"))

inputs.files(fileTree("$libprocessingDir/crates") {
Expand Down
2 changes: 1 addition & 1 deletion libprocessing
Show comments Open in desktop
Submodule libprocessing updated 100 files
Loading

Back | FazBrowse Home | New Git URL