Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2020v9 image (#2154)

Browse Source 
- Fix VISA include and FPGA header
- Fix missing VISA lib from executables
This commit is contained in:
Thad House
2019-12-04 20:38:43 -08:00
committed by Peter Johnson
parent 8e7cc3fe78
commit d003ec2dc9
17 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
simulation/lowfi_simulation/build.gradle
View File

@@ -116,7 +116,7 @@ if (!project.hasProperty('onlylinuxathena')) {
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib library: nativeName, linkage: 'shared'
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared')
}
}
}
@@ -131,7 +131,7 @@ if (!project.hasProperty('onlylinuxathena')) {
lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared'
lib library: nativeName, linkage: 'shared'
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared')
}
}
}