3 files changed, 25 insertions, 14 deletions

diff --git a/src/lexer.l b/src/lexer.l
index 188046f..f939330 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -118,7 +118,7 @@ use[ \t\r\n>]*"<"	{ BEGIN(cond_use); }
         else {
           usepath = sourcepath() / filename;
           if (!fs::exists(usepath)) {
-            usepath = boosty::absolute(fs::path(get_librarydir()) / filename);
+            usepath = locate_file(filename);
           }
         }
         /* Only accept regular files which exists */
@@ -214,7 +214,7 @@ void includefile()
 
   fs::path finfo = dirinfo / filename;
   if (!exists(finfo)) {
-    finfo = fs::path(get_librarydir()) / filepath / filename;
+    finfo = locate_file((fs::path(filepath) / filename).string());
   }
 
   filepath.clear();
diff --git a/src/parsersettings.cc b/src/parsersettings.cc
index a3a02b7..53b34f4 100644
--- a/src/parsersettings.cc
+++ b/src/parsersettings.cc
@@ -1,27 +1,38 @@
 #include "parsersettings.h"
 #include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
+#include "boosty.h"
 #include <qglobal.h> // Needed for Q_ defines - move the offending code somewhere else
 
-using namespace boost::filesystem;
-#include "boosty.h"
+namespace fs = boost::filesystem;
 
-std::string librarydir;
+std::vector<std::string> librarypath;
 
-void set_librarydir(const std::string &libdir)
+void add_librarydir(const std::string &libdir)
 {
-	librarydir = libdir;
+	librarypath.push_back(libdir);
 }
 
-const std::string &get_librarydir()
+/*!
+	Searces for the given file in library paths and returns the full path if found.
+	Returns an empty path if file cannot be found.
+*/
+std::string locate_file(const std::string &filename)
 {
-	return librarydir;
+	BOOST_FOREACH(const std::string &dir, librarypath) {
+		fs::path usepath = fs::path(dir) / filename;
+		if (fs::exists(usepath)) return usepath.string();
+	}
+	return std::string();
 }
 
 void parser_init(const std::string &applicationpath)
 {
+  // FIXME: Append paths from OPENSCADPATH before adding built-in paths
+
 	std::string librarydir;
-	path libdir(applicationpath);
-	path tmpdir;
+	fs::path libdir(applicationpath);
+	fs::path tmpdir;
 #ifdef Q_WS_MAC
 	libdir /= "../Resources"; // Libraries can be bundled
 	if (!is_directory(libdir / "libraries")) libdir /= "../../..";
@@ -37,5 +48,5 @@ void parser_init(const std::string &applicationpath)
 		if (is_directory(tmpdir = libdir / "libraries")) {
 			librarydir = boosty::stringy( tmpdir );
 		}
-	set_librarydir(librarydir);
+	if (!librarydir.empty()) add_librarydir(librarydir);
 }
diff --git a/src/parsersettings.h b/src/parsersettings.h
index a5dc939..007aa9c 100644
--- a/src/parsersettings.h
+++ b/src/parsersettings.h
@@ -6,7 +6,7 @@
 extern int parser_error_pos;
 
 void parser_init(const std::string &applicationpath);
-void set_librarydir(const std::string &libdir);
-const std::string &get_librarydir();
+void add_librarydir(const std::string &libdir);
+std::string locate_file(const std::string &filename);
 
 #endif