unbreaking more things that I missed the first time...
diff --git a/aos/build/externals.gyp b/aos/build/externals.gyp
index 5c26553..283e7ce 100644
--- a/aos/build/externals.gyp
+++ b/aos/build/externals.gyp
@@ -124,6 +124,9 @@
'type': 'none',
'direct_dependent_settings': {
'libraries': ['<(compiled_abs)/libjpeg/lib/libjpeg.a'],
+ 'cflags': [
+ '-isystem', '<(compiled)',
+ ],
},
},
{
@@ -217,7 +220,7 @@
'libraries': ['<(compiled_abs)/libcdd-<(libcdd_version)-prefix/lib/libcdd.a'],
},
'direct_dependent_settings': {
- 'include_dirs': ['<(compiled_abs)/libcdd-<(libcdd_version)-prefix/include'],
+ 'include_dirs': ['<(compiled_abs)/'],
},
},
],
diff --git a/aos/controls/polytope.h b/aos/controls/polytope.h
index ed4b36d..a873722 100644
--- a/aos/controls/polytope.h
+++ b/aos/controls/polytope.h
@@ -2,8 +2,8 @@
#define _AOS_CONTROLS_POLYTOPE_H_
#include "Eigen/Dense"
-#include "aos/externals/libcdd-094g-prefix/include/setoper.h"
-#include "aos/externals/libcdd-094g-prefix/include/cdd.h"
+#include "libcdd-094g-prefix/include/setoper.h"
+#include "libcdd-094g-prefix/include/cdd.h"
namespace aos {
namespace controls {
diff --git a/vision/JPEGRoutines.h b/vision/JPEGRoutines.h
index 17f1a68..c3b8e13 100644
--- a/vision/JPEGRoutines.h
+++ b/vision/JPEGRoutines.h
@@ -1,7 +1,7 @@
// for jpeglib.h
#include <stdio.h>
-#include "aos/externals/libjpeg/include/jpeglib.h"
+#include "libjpeg/include/jpeglib.h"
namespace frc971 {
namespace vision {
diff --git a/vision/OpenCVWorkTask.cpp b/vision/OpenCVWorkTask.cpp
index f17803e..8fc11eb 100644
--- a/vision/OpenCVWorkTask.cpp
+++ b/vision/OpenCVWorkTask.cpp
@@ -11,9 +11,10 @@
#include <vector>
#include <iostream>
+#include "libjpeg/include/jpeglib.h"
+
#include "aos/common/time.h"
#include "aos/atom_code/camera/Buffers.h"
-#include "aos/externals/libjpeg/include/jpeglib.h"
#include "aos/atom_code/init.h"
#include "aos/common/logging/logging.h"