switched to actually building all of the WPILib source correctly
Doing it wrong was creating dependency problems.
Had to fix some other unrelated build file bugs that made it not work at
the same time.
diff --git a/aos/build/externals.gyp b/aos/build/externals.gyp
index 1033551..0fa5fed 100644
--- a/aos/build/externals.gyp
+++ b/aos/build/externals.gyp
@@ -16,22 +16,30 @@
},
'targets': [
{
-# does nothing when OS!="crio"
'target_name': 'WPILib',
- 'type': 'none',
- 'conditions': [['OS=="crio"', {
- 'direct_dependent_settings': {
- 'cflags': [
- '-isystem', '<(aos_abs)/externals/WPILib',
- '-isystem', '<(aos_abs)/externals/WPILib/WPILib',
- ],
- 'link_settings': {
- 'libraries': [
- #'<(aos_abs)/externals/WPILib/WPILib.a',
- ],
- },
- },
- }]],
+ 'type': 'static_library',
+ 'sources': [
+ '<!@(find <(externals)/WPILib/WPILib/ -name *.cpp)',
+ ],
+ 'cflags!': [
+ '-Werror',
+ '-ggdb3',
+ '-O0'
+ ],
+ 'cflags': [
+ '-ggdb1',
+ '-O3'
+ ],
+ 'include_dirs': [
+ '<(externals)/WPILib',
+ '<(externals)/WPILib/WPILib',
+ ],
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '-isystem', '<(externals_abs)/WPILib',
+ '-isystem', '<(externals_abs)/WPILib/WPILib',
+ ],
+ },
},
{
'target_name': 'onejar',