Proper headless build fix

diff --git a/simgear/misc/parse_color.cxx b/simgear/misc/parse_color.cxx
index 4bcc20b62d3addd2868ee783ff45e4247d804f27..b739522413fbaf9cd029dc3aa843165e3826fc57 100644 (file)
--- a/simgear/misc/parse_color.cxx
+++ b/simgear/misc/parse_color.cxx
@@ -16,6 +16,10 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
+#include <simgear_config.h>
+#ifndef SIMGEAR_HEADLESS
+# include <osg/Vec4>
+#endif
 #include "parse_color.hxx"
 
 #include <boost/algorithm/string/predicate.hpp>

diff --git a/simgear/misc/parse_color.hxx b/simgear/misc/parse_color.hxx
index d74bffca5bd9b50a64f4c1ed48a4bf362d02c82f..83d662b7ae1bff2f286fc0d5ad8740660795b132 100644 (file)
--- a/simgear/misc/parse_color.hxx
+++ b/simgear/misc/parse_color.hxx
@@ -23,10 +23,6 @@
 #include <simgear/math/SGMathFwd.hxx>
 #include <simgear/math/SGVec4.hxx>
 
-#ifndef SIMGEAR_HEADLESS
-# include <osg/Vec4>
-#endif
-
 #include <string>
 
 namespace simgear
@@ -42,7 +38,7 @@ namespace simgear
    */
   bool parseColor(std::string str, SGVec4f& result);
 
-#ifndef SIMGEAR_HEADLESS
+#ifdef OSG_VEC4
   /**
    * Parse a (CSS) color into an osg::Vec4
    *