X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=f6a4dd65dc4add29b60ede81725fb2d4d62d24c8;hb=699493ee7346c578537f4e310702c57012686c22;hp=4a0e85ed5cab98db2a74e125d4541cae53d7e512;hpb=e68e95f8a44150e69d2f4b74995a12013dfe75aa;p=builder.git diff --git a/source/compile.cpp b/source/compile.cpp index 4a0e85e..f6a4dd6 100644 --- a/source/compile.cpp +++ b/source/compile.cpp @@ -21,23 +21,23 @@ using namespace Msp; Compile::Compile(Builder &b, const ObjectFile &obj): ExternalAction(b) { - const Component &comp=obj.get_component(); + const Component &comp = obj.get_component(); - work_dir=comp.get_package().get_source(); + work_dir = comp.get_package().get_source(); - FS::Path spath=obj.get_source().get_path(); + FS::Path spath = obj.get_source().get_path(); - string ext=FS::extpart(spath.str()); - const char *tool=0; + string ext = FS::extpart(spath.str()); + const char *tool = 0; if(ext==".cpp" || ext==".cc") - tool="CXX"; + tool = "CXX"; else - tool="CC"; + tool = "CC"; argv.push_back(builder.get_current_arch().get_tool(tool)); argv.push_back("-c"); - const BuildInfo &binfo=comp.get_build_info(); + const BuildInfo &binfo = comp.get_build_info(); for(list::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i) argv.push_back("-W"+*i); for(list::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i) @@ -47,7 +47,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj): for(list::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i) argv.push_back("-D"+*i); - FS::Path opath=obj.get_path(); + FS::Path opath = obj.get_path(); argv.push_back("-o"); argv.push_back(relative(opath, work_dir).str()); argv.push_back(relative(spath, work_dir).str());