more build fixes WRONG BRANCH
diff --git a/aos/atom_code/messages/DriverStationDisplay.cpp b/aos/atom_code/messages/DriverStationDisplay.cpp
index e48a1eb..076ba3f 100644
--- a/aos/atom_code/messages/DriverStationDisplay.cpp
+++ b/aos/atom_code/messages/DriverStationDisplay.cpp
@@ -3,6 +3,8 @@
#include <stdarg.h>
#include <stdio.h>
+#include "aos/common/logging/logging.h"
+
using namespace aos;
static const aos_type_sig signature = {sizeof(DriverStationDisplay), 1234, 10};
diff --git a/aos/atom_code/messages/DriverStationDisplay.h b/aos/atom_code/messages/DriverStationDisplay.h
index 9ce3712..5feffb8 100644
--- a/aos/atom_code/messages/DriverStationDisplay.h
+++ b/aos/atom_code/messages/DriverStationDisplay.h
@@ -4,8 +4,8 @@
#include <stdint.h>
#include <string.h>
-#include "aos/aos_core.h"
#include "aos/common/type_traits.h"
+#include "aos/atom_code/ipc_lib/queue.h"
namespace aos {
const size_t kLineLength = 21;
diff --git a/aos/atom_code/messages/messages.gyp b/aos/atom_code/messages/messages.gyp
index ddbe9ec..a5286cc 100644
--- a/aos/atom_code/messages/messages.gyp
+++ b/aos/atom_code/messages/messages.gyp
@@ -9,6 +9,7 @@
],
'dependencies': [
'<(AOS)/build/aos.gyp:aos_shared_lib',
+ '<(AOS)/build/aos.gyp:logging',
],
'export_dependent_settings': [
'<(AOS)/build/aos.gyp:aos_shared_lib',
@@ -28,10 +29,10 @@
'DriverStationDisplay.cpp',
],
'dependencies': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib'
+ '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib',
],
'export_dependent_settings': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib'
+ '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib',
],
},
],
diff --git a/aos/atom_code/output/output.gyp b/aos/atom_code/output/output.gyp
index 9e264d5..65232b6 100644
--- a/aos/atom_code/output/output.gyp
+++ b/aos/atom_code/output/output.gyp
@@ -28,6 +28,7 @@
],
'dependencies': [
'<(AOS)/common/network/network.gyp:socket',
+ '<(AOS)/build/aos.gyp:aos_core',
],
'export_dependent_settings': [
'<(AOS)/common/network/network.gyp:socket',
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 8dd1370..5e76e69 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -97,6 +97,7 @@
},
'dependencies': [
'<(AOS)/common/common.gyp:queues',
+ '<(AOS)/common/common.gyp:queues',
],
'includes': ['../build/queues.gypi'],
},
diff --git a/aos/common/messages/messages.gyp b/aos/common/messages/messages.gyp
index e7669c7..434281d 100644
--- a/aos/common/messages/messages.gyp
+++ b/aos/common/messages/messages.gyp
@@ -37,11 +37,11 @@
'header_path': 'aos/common/messages',
},
'dependencies': [
- '<(AOS)/build/aos.gyp:aos_internal_nolib',
+ '<(EXTERNALS):WPILib',
'<(AOS)/common/common.gyp:queues',
],
'export_dependent_settings': [
- '<(AOS)/build/aos.gyp:aos_internal_nolib',
+ '<(EXTERNALS):WPILib',
'<(AOS)/common/common.gyp:queues',
],
'includes': ['../../build/queues.gypi'],