updated the build system for the new version of wpilib
git-svn-id: https://robotics.mvla.net/svn/frc971/2013/trunk/src@4178 f308d9b7-e957-4cde-b6ac-9a88185e7312
diff --git a/aos/build/externals.gyp b/aos/build/externals.gyp
index 796fdeb..eb19cd0 100644
--- a/aos/build/externals.gyp
+++ b/aos/build/externals.gyp
@@ -20,6 +20,7 @@
'direct_dependent_settings': {
'cflags': [
'-isystem', '<(aos_abs)/externals/WPILib',
+ '-isystem', '<(aos_abs)/externals/WPILib/WPILib',
],
'link_settings': {
'libraries': [
diff --git a/aos/crio/Talon.h b/aos/crio/Talon.h
index c116a4d..5942a77 100644
--- a/aos/crio/Talon.h
+++ b/aos/crio/Talon.h
@@ -7,7 +7,7 @@
// Used for controlling a Talon speed controller. Non-standard API and
// namespace so that the likely WPILib version will be drop-in replaceable.
-class Talon : public SafePWM, public SpeedController, public PIDOutput {
+class Talon : public SafePWM, public SpeedController {
public:
explicit Talon(UINT32 channel);