summaryrefslogtreecommitdiff
path: root/slicer/test/included
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2018-04-03 18:22:09 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2018-04-03 18:49:39 +0100
commit3ce83f75bdd500a9054481bfdd2a32ce9d9e44b7 (patch)
tree347981d31b438dc2ba422595092ce88fe179447f /slicer/test/included
parentRearrange the code to remove explicit instantiation after implicit warning (diff)
downloadslicer-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/test/included')
-rw-r--r--slicer/test/included/Jamfile.jam9
1 files changed, 3 insertions, 6 deletions
diff --git a/slicer/test/included/Jamfile.jam b/slicer/test/included/Jamfile.jam
index bbf476d..a0fcac6 100644
--- a/slicer/test/included/Jamfile.jam
+++ b/slicer/test/included/Jamfile.jam
@@ -1,18 +1,15 @@
lib dl ;
lib pthread ;
-lib Ice ;
-lib IceUtil ;
+lib Ice++11 ;
lib included :
included.ice
:
<library>pthread
- <library>Ice
- <library>IceUtil
+ <library>Ice++11
: :
<library>pthread
- <library>Ice
- <library>IceUtil
+ <library>Ice++11
<include>.
;