diff options
Diffstat (limited to 'project2/ice/iceCompile.cpp')
| -rw-r--r-- | project2/ice/iceCompile.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/project2/ice/iceCompile.cpp b/project2/ice/iceCompile.cpp index 3df8dbd..74b0b45 100644 --- a/project2/ice/iceCompile.cpp +++ b/project2/ice/iceCompile.cpp @@ -8,12 +8,14 @@ namespace fs = boost::filesystem; std::string IceCompile::slice2cpp; +std::string IceCompile::slicer; std::string IceCompile::cxx; std::string IceCompile::linker; std::string IceCompile::cxxopts; std::string IceCompile::linkeropts; fs::path IceCompile::tmpdir; fs::path IceCompile::headerdir; +fs::path IceCompile::slicerheaderdir; DECLARE_OPTIONS(IceCompile, "ICE Compile Options") ("ice.compile.cxx", Options::value(&cxx, "g++"), @@ -26,10 +28,14 @@ DECLARE_OPTIONS(IceCompile, "ICE Compile Options") "The extra arguments to pass to linker") ("ice.compile.slice2cpp", Options::value(&slice2cpp, "slice2cpp"), "The ICE Slice to CPP processor to use") +("ice.compile.slicer", Options::value(&slicer, "slicer"), + "The Slicer to CPP processor to use") ("ice.compile.tmpdir", Options::value(&tmpdir, "/tmp/project2.slice"), "The temporary directory used when compiling") ("ice.compile.headers", Options::value(&headerdir, "/usr/include/project2"), "The root folder where Project2 header files are found") +("ice.compile.slicerheaders", Options::value(&slicerheaderdir, "/usr/include/slicer"), + "The root folder where Slicer header files are found") END_OPTIONS(IceCompile); IceCompile::IceCompile(const boost::filesystem::path & s) : @@ -81,8 +87,10 @@ void IceCompile::Compile(const fs::path & in, const fs::path & out) const { const auto compile = stringbf( - "%s %s -o %s -x c++ -c -I %s -I %s -I ../libmisc/ -I %s -I %s -I %s `pkg-config --cflags glibmm-2.4` %s", + "%s %s -o %s -x c++ -c -I %s -I %s -I ../libmisc/ -I %s -I %s -I %s -I %s -I %s `pkg-config --cflags glibmm-2.4` %s", cxx, cxxopts, out, tmpdir, + slicerheaderdir, + headerdir.parent_path() / "libmisc", headerdir / "lib", headerdir / "common", headerdir / "ice", |