Changeset 71 in flair-dev

Timestamp:

Mar 9, 2018, 4:33:18 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

mambo edu

Location:

trunk

Files:

• cmake-modules/FlairUseFile.cmake (modified) (1 diff)
• scripts/flair_compile_all.sh (modified) (1 diff)

trunk/cmake-modules/FlairUseFile.cmake

@@ -132 +132 @@
 endif()
 if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")      
-  SET (PARROT_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairMinidrones.a -Wl,--no-whole-archive)
+  SET (PARROT_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairMinidrones.a ${FLAIRHDS_LIBRARY_DIR}/libFlairMamboEdu.a -Wl,--no-whole-archive)
         set(FLAIR_LIBRARIES_NRT ${PARROT_LIB}  ${FLAIR_LIBRARIES_NRT} nmea)
 endif()

trunk/scripts/flair_compile_all.sh

@@ -60 +60 @@
 
         if [ -d $FLAIR_ROOT/flair-hds ]; then
-                for projects in FlairBebop FlairArdrone2 FlairMinidrones VisionFilter; do
+                for projects in FlairBebop FlairArdrone2 FlairMinidrones FlairMamboEdu VisionFilter; do
                         configure $FLAIR_ROOT/flair-hds/src/lib $projects
                         compile $FLAIR_ROOT/flair-hds/src/lib $projects