From 186bae2bd445f16540a66e23e81c307c194cf721 Mon Sep 17 00:00:00 2001 From: Thomas Geymayer Date: Mon, 5 Nov 2012 13:35:06 +0100 Subject: [PATCH] Proper headless build fix --- simgear/misc/parse_color.cxx | 4 ++++ simgear/misc/parse_color.hxx | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/simgear/misc/parse_color.cxx b/simgear/misc/parse_color.cxx index 4bcc20b6..b7395224 100644 --- 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 +#ifndef SIMGEAR_HEADLESS +# include +#endif #include "parse_color.hxx" #include diff --git a/simgear/misc/parse_color.hxx b/simgear/misc/parse_color.hxx index d74bffca..83d662b7 100644 --- a/simgear/misc/parse_color.hxx +++ b/simgear/misc/parse_color.hxx @@ -23,10 +23,6 @@ #include #include -#ifndef SIMGEAR_HEADLESS -# include -#endif - #include 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 * -- 2.39.5