From: Mikko Rasa Date: Tue, 30 Oct 2007 14:43:25 +0000 (+0000) Subject: Fix include and library search order X-Git-Tag: 0.9~17 X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=69ad3610053e140cb5108f53e4c46a0583e33559;p=builder.git Fix include and library search order Fix some header names Add binary package for DevIL --- diff --git a/builderrc b/builderrc index 0947330..6b2b0ea 100644 --- a/builderrc +++ b/builderrc @@ -51,6 +51,14 @@ binary_package "xlib" }; }; +binary_package "devil" +{ + build_info + { + library "IL"; + }; +}; + architecture "arm" { prefix "arm-linux-gnu"; diff --git a/source/builder.cpp b/source/builder.cpp index d9444ce..15c9e54 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -8,7 +8,7 @@ Distributed under the LGPL #include #include #include -#include +#include #include #include #include @@ -239,14 +239,14 @@ Target *Builder::get_header(const string &include, const string &arch, const str if(arch=="native") syspath.push_back("/usr/include"); else - syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib"); + syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/include"); syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str()); Target *tgt=0; - for(list::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) - tgt=get_header(Path(*j)/fn); for(list::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) tgt=get_header(cwd/ *j/fn); + for(list::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) + tgt=get_header(Path(*j)/fn); includes.insert(TargetMap::value_type(id, tgt)); @@ -289,10 +289,10 @@ Target *Builder::get_library(const string &lib, const string &arch, const list +#include #include #include #include "builder.h" diff --git a/source/config.cpp b/source/config.cpp index 482ceb8..2e3741e 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -6,7 +6,7 @@ Distributed under the LGPL */ #include -#include +#include #include #include #include "builder.h"