X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=2e7932c1c57a93dbed709797eb14a05b5a9572ea;hb=0fd98b61eb112fe397c67b7735627b7bbdd01e41;hp=0bea2a96b03048c4d476815b56a799d7270526f2;hpb=57bdb055acb0453c75b22cb64f35cc0e817a2827;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 0bea2a9..2e7932c 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,5 +1,5 @@
-#include <msp/strconv.h>
-#include <msp/strutils.h>
+#include <msp/strings/lexicalcast.h>
+#include <msp/strings/utils.h>
 #include "builder.h"
 #include "misc.h"
 #include "package.h"
@@ -188,7 +188,8 @@ Package *Package::create(Builder &b, const string &name)
 Package::Package(Builder &b, const string &n, const vector<string> &info):
 	builder(b),
 	name(n),
-	buildable(false)
+	buildable(false),
+	conf_done(false)
 {
 	for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
 	{
@@ -270,15 +271,16 @@ void Package::create_build_info()
 			export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
 
 		string optimize=config.get_option("optimize").value;
-		if(strtol(optimize))
+		if(lexical_cast<unsigned>(optimize))
 		{
 			build_info.cflags.push_back("-O"+optimize);
+			build_info.ldflags.push_back("-O"+optimize);
 			string cpu=config.get_option("cpu").value;
 			if(cpu!="auto")
 				build_info.cflags.push_back("-march="+cpu);
 		}
 
-		if(strtobool(config.get_option("debug").value))
+		if(lexical_cast<bool>(config.get_option("debug").value))
 		{
 			build_info.cflags.push_back("-ggdb");
 			build_info.defines.push_back("DEBUG");
@@ -313,6 +315,7 @@ Package::Loader::Loader(Package &p):
 	add("require",     &Loader::require);
 	add("program",     &Loader::program);
 	add("library",     &Loader::library);
+	add("module",      &Loader::module);
 	add("headers",     &Loader::headers);
 	add("build_info",  &Loader::build_info);
 }
@@ -336,6 +339,13 @@ void Package::Loader::library(const string &n)
 	pkg.components.push_back(prog);
 }
 
+void Package::Loader::module(const string &n)
+{
+	Component prog(pkg, Component::MODULE, n);
+	load_sub(prog);
+	pkg.components.push_back(prog);
+}
+
 void Package::Loader::headers(const string &n)
 {
 	Component prog(pkg, Component::HEADERS, n);