copying branch over from other 2013 repo
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 967eb51..81e2da7 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -132,12 +132,19 @@
{
'target_name': 'controls',
'type': 'static_library',
- 'sources': [],
+ 'sources': [
+ # 'control_loop/ControlLoop-tmpl.h',
+ ],
'dependencies': [
'<(AOS)/common/messages/messages.gyp:aos_queues',
'<(AOS)/build/aos.gyp:logging',
'timing',
],
+ 'export_dependent_settings': [
+ '<(AOS)/common/messages/messages.gyp:aos_queues',
+ '<(AOS)/build/aos.gyp:logging',
+ 'timing',
+ ],
},
{
'target_name': 'queue_test',
@@ -208,6 +215,34 @@
],
},
{
+ 'target_name': 'die',
+ 'type': 'static_library',
+ 'sources': [
+ 'die.cc',
+ ],
+ },
+ {
+ 'target_name': 'mutex',
+ 'type': 'static_library',
+ 'conditions': [
+ ['OS=="crio"', {
+ 'sources': [
+ '<(AOS)/crio/shared_libs/mutex.cpp',
+ ],
+ }, {
+ 'sources': [
+ '<(AOS)/atom_code/ipc_lib/mutex.cpp',
+ ],
+ 'dependencies': [
+ '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib',
+ ],
+ 'export_dependent_settings': [
+ '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib',
+ ],
+ }],
+ ],
+ },
+ {
'target_name': 'mutex_test',
'type': '<(aos_target)',
'sources': [