Update to 2020v9 image (#2154)

- 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

View File

@@ -93,7 +93,7 @@ model {
lib project: ':simulation:halsim_ds_nt', library: 'halsim_ds_nt', linkage: 'shared'
}
if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared')
}
}
sources {
@@ -147,7 +147,7 @@ model {
lib project: ':simulation:halsim_ds_nt', library: 'halsim_ds_nt', linkage: 'shared'
}
if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'visa_shared', 'ni_runtime_shared')
}
}
sources {