diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-03 18:22:09 +0100 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-03 18:49:39 +0100 |
commit | 3ce83f75bdd500a9054481bfdd2a32ce9d9e44b7 (patch) | |
tree | 347981d31b438dc2ba422595092ce88fe179447f /slicer/tool/Jamfile.jam | |
parent | Rearrange the code to remove explicit instantiation after implicit warning (diff) | |
download | slicer-3ce83f75bdd500a9054481bfdd2a32ce9d9e44b7.tar.bz2 slicer-3ce83f75bdd500a9054481bfdd2a32ce9d9e44b7.tar.xz slicer-3ce83f75bdd500a9054481bfdd2a32ce9d9e44b7.zip |
Ice 3.7
Implements Slicer for Ice 3.7. This is largely:
* Pointers are now all std::shared_ptr
* libSlice isn't installed, so we build part of it into libslicer-compiler
* Library name change to use Ice++11
There are a few other things, but mostly just minor language/function
name compatibility changes.
The compiling of libSlice is a bit of a hack, currently comprising a git
submodule of Ice itself, and a few dirty defines on the command line,
but appears to be functionally satisfactory if a little unpleasant.
Diffstat (limited to 'slicer/tool/Jamfile.jam')
-rw-r--r-- | slicer/tool/Jamfile.jam | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/slicer/tool/Jamfile.jam b/slicer/tool/Jamfile.jam index cc0ace7..de8b8f8 100644 --- a/slicer/tool/Jamfile.jam +++ b/slicer/tool/Jamfile.jam @@ -1,19 +1,37 @@ import package ; -lib Slice ; -lib Ice ; -lib IceUtil ; +lib Ice++11 ; lib po : : <name>boost_program_options ; lib adhocutil : : : : <include>/usr/include/adhocutil ; lib boost_system ; lib boost_filesystem ; +lib mcpp ; + +lib Slice : + ../../ice/cpp/src/Slice/Parser.cpp + ../../ice/cpp/src/Slice/Grammar.cpp + ../../ice/cpp/src/Slice/Preprocessor.cpp + ../../ice/cpp/src/Slice/CPlusPlusUtil.cpp + ../../ice/cpp/src/Slice/SliceUtil.cpp + ../../ice/cpp/src/Slice/FileTracker.cpp + ../../ice/cpp/src/Slice/Scanner.cpp + : + <define>register= + <cxxflags>-fPIC + <cxxflags>-UICE_CPP11_MAPPING + <cxxflags>-Wno-error=unused-parameter + <include>../../ice/cpp/src + <link>static + : : + <include>../../ice/cpp/src + ; lib slicer-compiler : parser.cpp : <library>Slice - <library>Ice - <library>IceUtil + <library>Ice++11 + <library>mcpp <library>boost_system <library>boost_filesystem <library>adhocutil |