Force shared linking on Android

[builder.git] / source / binarypackage.cpp

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index f00f0faf10519e7211dfd7df4a38af5bcf76eb29..94667c989dede480f3b36afbddb04108f84881cb 100644 (file)
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -60,7 +60,7 @@ void BinaryPackage::do_prepare()
                        *j = prefix/ *j;
 
                for(HeaderList::const_iterator j=headers.begin(); j!=headers.end(); ++j)
-                       all_found &= (builder.get_vfs().find_header(*j, incpath, system)!=0);
+                       all_found &= (builder.get_vfs().find_header(*j, 0, incpath, system)!=0);
 
                if(all_found)
                {
@@ -72,7 +72,8 @@ void BinaryPackage::do_prepare()
 
        if(base_path.empty())
        {
-               builder.problem(name, "Cannot locate files");
+               // TODO report which files were not found
+               problems.push_back("Cannot locate files");
                return;
        }
 
@@ -123,7 +124,7 @@ BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, c
 
 
 BinaryPackage::Loader::Loader(BinaryPackage &p):
-       DataFile::DerivedObjectLoader<BinaryPackage, Package>(p)
+       DataFile::DerivedObjectLoader<BinaryPackage, Package::Loader>(p)
 {
        add("build_info", &Loader::build_info);
        add("header",     &Loader::header);