FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proper headless build fix

Browse Source
This commit is contained in:
Thomas Geymayer 2012-11-05 13:35:06 +01:00
parent f83c8828f0
commit 186bae2bd4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/misc/parse_color.cxx
View File

@ -16,6 +16,10 @@
// License along with this library; if not, write to the Free Software // License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA // 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 "parse_color.hxx"
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>

6
simgear/misc/parse_color.hxx
View File

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