Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[simulation] Fix halsim_gui ntcore and wpiutil deps (#2908)

Browse Source 
They were being linked out of order, so ntcore wasn't being linked.
This commit is contained in:
Peter Johnson
2020-12-04 23:30:17 -08:00
committed by GitHub
parent 963ad5c255
commit 125af556ce
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
simulation/halsim_gui/build.gradle
View File

@@ -3,8 +3,6 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra
description = "A plugin that creates a simulation gui"
ext {
includeWpiutil = true
includeNtCore = true
pluginName = 'halsim_gui'
}
@@ -23,10 +21,12 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra
model {
binaries {
all {
lib project: ':wpimath', library: 'wpimath', linkage: 'shared'
lib project: ':glass', library: 'glassnt', linkage: 'static'
lib project: ':glass', library: 'glass', linkage: 'static'
lib project: ':wpigui', library: 'wpigui', linkage: 'static'
lib project: ':wpimath', library: 'wpimath', linkage: 'shared'
lib project: ':ntcore', library: 'ntcore', linkage: 'shared'
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
nativeUtils.useRequiredLibrary(it, 'imgui_static')
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio || it.targetPlatform.name == nativeUtils.wpi.platforms.raspbian || it.targetPlatform.name == nativeUtils.wpi.platforms.aarch64bionic) {
it.buildable = false