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

Update to 2020v6 image (#2078)

Browse Source
This commit is contained in:
Thad House
2019-11-13 21:35:52 -08:00
committed by Peter Johnson
parent 708009cd20
commit b7bc1ea745
16 changed files with 76 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wpilibcExamples/build.gradle
View File

@@ -44,21 +44,6 @@ ext {
apply from: "${rootDir}/shared/opencv.gradle"
ext {
chipObjectComponents = ['commands']
netCommComponents = ['commands']
examplesMap.each { key, value ->
chipObjectComponents << key.toString()
netCommComponents << key.toString()
}
templatesMap.each { key, value ->
chipObjectComponents << key.toString()
netCommComponents << key.toString()
}
}
apply from: "${rootDir}/shared/nilibraries.gradle"
model {
components {
commands(NativeLibrarySpec) {
@@ -107,6 +92,9 @@ model {
lib project: ':simulation:halsim_print', library: 'halsim_print', linkage: 'shared'
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')
}
}
sources {
cpp {
@@ -158,6 +146,9 @@ model {
lib project: ':simulation:halsim_print', library: 'halsim_print', linkage: 'shared'
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')
}
}
sources {
cpp {