use the local WPILib copy
Change-Id: I04dbcc5c485c1eca9ea18128a05f2548567e1d24
diff --git a/aos/build/externals.gyp b/aos/build/externals.gyp
index de00669..d4bce22 100644
--- a/aos/build/externals.gyp
+++ b/aos/build/externals.gyp
@@ -16,17 +16,40 @@
'libevent_version': '2.0.21',
'libcdd_version': '094g',
'stm32flash_commit': '8399fbe1baf2b7d097746786458021d92895d71b',
+
+ 'allwpilib': '<(AOS)/externals/allwpilib',
},
'targets': [
{
- 'target_name': 'WPILib_roboRIO',
+ 'target_name': 'WPILib',
'type': 'static_library',
+ 'variables': {
+ 'header_dirs': [
+ '<(allwpilib)/wpilibc/wpilibC++/include',
+ '<(allwpilib)/wpilibc/wpilibC++Devices/include',
+ '<(allwpilib)/hal/include',
+ '<(allwpilib)/hal/lib/Athena/FRC_FPGA_ChipObject',
+ ],
+ },
'include_dirs': [
- '/opt/wpilib_4.8.3/include',
+ '<@(header_dirs)'
+ ],
+ 'cflags': [
+ '-Wno-error=unused-parameter',
+ '-Wno-error=switch-enum',
+ ],
+ 'sources': [
+ '<!@(ls <(allwpilib)/wpilibc/wpilibC++/src/*.cpp)',
+ '<!@(ls <(allwpilib)/wpilibc/wpilibC++Devices/src/*.cpp)',
+ '<!@(ls <(allwpilib)/wpilibc/wpilibC++Devices/src/Internal/*.cpp)',
+ '<!@(ls <(allwpilib)/hal/lib/Athena/*.cpp)',
+ '<!@(ls <(allwpilib)/hal/lib/Athena/ctre/*.cpp)',
],
'link_settings': {
+ 'library_dirs': [
+ '<(allwpilib)/ni-libraries',
+ ],
'libraries': [
- '-L/opt/wpilib_4.8.3/lib/',
'-lpthread',
'-lFRC_NetworkCommunication',
'-lRoboRIO_FRC_ChipObject',
@@ -35,13 +58,11 @@
'-lNiRioSrv',
'-lspi',
'-li2c',
- '/opt/wpilib_4.8.3/lib/libwpilib_nonshared.a',
- '/opt/wpilib_4.8.3/lib/libHALAthena.a',
],
},
'direct_dependent_settings': {
- 'cflags': [
- '-isystem', '/opt/wpilib_4.8.3/include/',
+ 'include_dirs': [
+ '<@(header_dirs)'
],
},
},
diff --git a/frc971/wpilib/wpilib.gyp b/frc971/wpilib/wpilib.gyp
index 66a191d..170a4c5 100644
--- a/frc971/wpilib/wpilib.gyp
+++ b/frc971/wpilib/wpilib.gyp
@@ -9,7 +9,7 @@
'dependencies': [
'<(AOS)/linux_code/linux_code.gyp:init',
'<(AOS)/build/aos.gyp:logging',
- '<(EXTERNALS):WPILib_roboRIO',
+ '<(EXTERNALS):WPILib',
'<(DEPTH)/frc971/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
'<(AOS)/common/controls/controls.gyp:control_loop',
'<(AOS)/common/controls/controls.gyp:sensor_generation',
@@ -35,11 +35,11 @@
'buffered_pcm.cc',
],
'dependencies': [
- '<(EXTERNALS):WPILib_roboRIO',
+ '<(EXTERNALS):WPILib',
'<(AOS)/build/aos.gyp:logging',
],
'export_dependent_settings': [
- '<(EXTERNALS):WPILib_roboRIO',
+ '<(EXTERNALS):WPILib',
],
},
{
@@ -49,11 +49,11 @@
'gyro_interface.cc',
],
'dependencies': [
- '<(EXTERNALS):WPILib_roboRIO',
+ '<(EXTERNALS):WPILib',
'<(AOS)/build/aos.gyp:logging',
],
'export_dependent_settings': [
- '<(EXTERNALS):WPILib_roboRIO',
+ '<(EXTERNALS):WPILib',
],
},
{
@@ -103,7 +103,7 @@
'joystick_sender.cc',
],
'dependencies': [
- '<(EXTERNALS):WPILib_roboRIO',
+ '<(EXTERNALS):WPILib',
'<(AOS)/common/messages/messages.gyp:robot_state',
'<(AOS)/linux_code/linux_code.gyp:init',
'<(AOS)/common/network/network.gyp:team_number',
@@ -117,10 +117,10 @@
#'hall_effect.h',
],
'dependencies': [
- '<(EXTERNALS):WPILib_roboRIO',
+ '<(EXTERNALS):WPILib',
],
'export_dependent_settings': [
- '<(EXTERNALS):WPILib_roboRIO',
+ '<(EXTERNALS):WPILib',
],
},
],