From 6ab83e5d3320b574529252f9852dcf7ce89dcab4 Mon Sep 17 00:00:00 2001
From: Voha <vovastarikh@gmail.com>
Date: Sat, 10 Aug 2013 21:27:36 +0300
Subject: [PATCH] fixed build errors with clang in MacOsX 10.9(DP5) and xCode
 5.0(DP5)

---
 ground/openpilotgcs/src/plugins/config/twostep.cpp | 3 ++-
 ground/openpilotgcs/src/plugins/ophid/ophid.pro    | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/twostep.cpp b/ground/openpilotgcs/src/plugins/config/twostep.cpp
index e1562af29..d6534d7cc 100644
--- a/ground/openpilotgcs/src/plugins/config/twostep.cpp
+++ b/ground/openpilotgcs/src/plugins/config/twostep.cpp
@@ -126,7 +126,7 @@ Vector3f twostep_bias_only(const Vector3f samples[],
                            const float noise)
 {
     // \tilde{H}
-    Vector3f centeredSamples[n_samples];
+    Vector3f* centeredSamples = new Vector3f[n_samples];
     // z_k
     float sampleDeltaMag[n_samples];
     // eq 7 and 8 applied to samples
@@ -172,6 +172,7 @@ Vector3f twostep_bias_only(const Vector3f samples[],
         // Note that the negative has been done twice
         estimate += neg_increment;
     }
+    delete[] centeredSamples;
     return estimate;
 }
 
diff --git a/ground/openpilotgcs/src/plugins/ophid/ophid.pro b/ground/openpilotgcs/src/plugins/ophid/ophid.pro
index d5f2d04cb..9f67ce6c8 100644
--- a/ground/openpilotgcs/src/plugins/ophid/ophid.pro
+++ b/ground/openpilotgcs/src/plugins/ophid/ophid.pro
@@ -39,9 +39,9 @@ macx {
            -arch ppc \
            -arch i386
     LIBS += $(ARCH) \
-            -Wl,-syslibroot,$(SDK) \
-            -framework IOKit \
-            -framework CoreFoundation
+			-framework IOKit \
+			-framework CoreFoundation \
+			-Wl -syslibroot $(SDK)
 }
 
 linux-g++ {