diff options
Diffstat (limited to 'project2/ice/iceCompile.cpp')
| -rw-r--r-- | project2/ice/iceCompile.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/project2/ice/iceCompile.cpp b/project2/ice/iceCompile.cpp index a518cde..eee0463 100644 --- a/project2/ice/iceCompile.cpp +++ b/project2/ice/iceCompile.cpp @@ -1,11 +1,11 @@ #include <pch.hpp> #include "iceCompile.h" -#include <boost/filesystem/operations.hpp> +#include <filesystem> #include <logger.h> -#include <misc.h> +#include <buffer.h> #include <dlfcn.h> -namespace fs = boost::filesystem; +namespace fs = std::filesystem; std::string IceCompile::slice2cpp; std::string IceCompile::slicer; @@ -20,11 +20,11 @@ fs::path IceCompile::slicerheaderdir; DECLARE_OPTIONS(IceCompile, "ICE Compile Options") ("ice.compile.cxx", Options::value(&cxx, "g++"), "The C++ compiler to use") -("ice.compile.cxxopts", Options::value(&cxxopts, "-Wall -Werror -std=c++11 -O3 -march=native -fPIC"), +("ice.compile.cxxopts", Options::value(&cxxopts, "-Wall -Werror -std=c++17 -DICE_CPP11_MAPPING -O3 -march=native -fPIC"), "The extra arguments to pass to the C++ compiler") ("ice.compile.linker", Options::value(&linker, "g++"), "The linker to use") -("ice.compile.linkeropts", Options::value(&linkeropts, ""), +("ice.compile.linkeropts", Options::value(&linkeropts, "-Wl,--strip-all,--gc-sections"), "The extra arguments to pass to linker") ("ice.compile.slice2cpp", Options::value(&slice2cpp, "slice2cpp"), "The ICE Slice to CPP processor to use") @@ -38,13 +38,13 @@ DECLARE_OPTIONS(IceCompile, "ICE Compile Options") "The root folder where Slicer header files are found") END_OPTIONS(IceCompile); -IceCompile::IceCompile(const boost::filesystem::path & s) : +IceCompile::IceCompile(const std::filesystem::path & s) : slice(s), components(0) { } -IceCompile::IceCompile(const boost::filesystem::path & s, const Deps & d) : +IceCompile::IceCompile(const std::filesystem::path & s, const Deps & d) : slice(s), components(0), deps(d) @@ -102,11 +102,9 @@ IceCompile::Compile(const fs::path & in, const fs::path & out) if (components == 0) return; const auto compile = stringbf( - "%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", + "%s %s -o %s -x c++ -c -fvisibility=hidden -I %s -I %s -I /usr/include/adhocutil -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", headerdir / "daemon" / "lib", |