Changeset 268 in flair-src for trunk/lib/FlairMeta/src

Timestamp:

Oct 4, 2018, 1:49:49 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

add defines for architectures to speed up compile time

Location:

trunk/lib/FlairMeta/src

Files:

• HdsX8.cpp (modified) (2 diffs)
• SimuX4.cpp (modified) (2 diffs)
• SimuX8.cpp (modified) (2 diffs)
• UavFactory.cpp (modified) (3 diffs)
• XAir.cpp (modified) (2 diffs)

trunk/lib/FlairMeta/src/HdsX8.cpp

@@ -15 +15 @@
 //
 /*********************************************************************/
+#ifdef ARMV7A
 
 #include "HdsX8.h"
@@ -76 +77 @@
 } // end namespace meta
 } // end namespace flair
+
+#endif

trunk/lib/FlairMeta/src/SimuX4.cpp

@@ -15 +15 @@
 //
 /*********************************************************************/
+#ifdef CORE2_64
 
 #include "SimuX4.h"
@@ -102 +103 @@
 } // end namespace meta
 } // end namespace flair
+
+#endif

trunk/lib/FlairMeta/src/SimuX8.cpp

@@ -15 +15 @@
 //
 /*********************************************************************/
+#ifdef CORE2_64
 
 #include "SimuX8.h"
@@ -102 +103 @@
 } // end namespace meta
 } // end namespace flair
+
+#endif

trunk/lib/FlairMeta/src/UavFactory.cpp

@@ -57 +57 @@
   }
 
+#ifdef ARMV7A
   if (type == "hds_x4") {
     getFrameworkManager()->Err("UAV type %s not yet implemented\n", type.c_str());
@@ -67 +68 @@
     getFrameworkManager()->Err("UAV type %s not yet implemented\n", type.c_str());
     return NULL;
-  } else if (type.compare(0, 7, "x4_simu") == 0) {
+  } else {
+    getFrameworkManager()->Err("UAV type %s unknown\n", type.c_str());
+    return NULL;
+  }
+#endif
+#ifdef CORE2_64
+  if (type.compare(0, 7, "x4_simu") == 0) {
     int simu_id = 0;
     if (type.size() > 7) {
@@ -83 +90 @@
     return NULL;
   }
+#endif
 }
 

trunk/lib/FlairMeta/src/XAir.cpp

@@ -15 +15 @@
 //
 /*********************************************************************/
+#ifdef ARMV7A
 
 #include "XAir.h"
@@ -72 +73 @@
 } // end namespace meta
 } // end namespace flair
+
+#endif