diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2020-08-22 16:59:22 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2020-08-22 16:59:22 +0100 |
| commit | 684c1675a8a04073e769a565bee8acd7ca46247d (patch) | |
| tree | 5d5a770330dd50b5747181dbd1f5643141d20ee7 | |
| parent | Apply previous fixes to enums too (diff) | |
| download | slicer-1.10.3.tar.bz2 slicer-1.10.3.tar.xz slicer-1.10.3.zip | |
Build against external slicer-parser libraryslicer-1.10.3
| -rw-r--r-- | .gitmodules | 4 | ||||
| m--------- | ice | 0 | ||||
| -rw-r--r-- | slicer/tool/Jamfile.jam | 5 | ||||
| -rw-r--r-- | slicer/tool/slice/Jamroot.jam | 28 |
4 files changed, 2 insertions, 35 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e0e648c..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "ice"] - path = ice - url = https://github.com/zeroc-ice/ice - branch = 3.7 diff --git a/ice b/ice deleted file mode 160000 -Subproject 827fb617431b61f1fe811139f7b7f33beb45dbf diff --git a/slicer/tool/Jamfile.jam b/slicer/tool/Jamfile.jam index e8ef3e9..98067b9 100644 --- a/slicer/tool/Jamfile.jam +++ b/slicer/tool/Jamfile.jam @@ -2,14 +2,13 @@ import package ; lib po : : <name>boost_program_options ; lib stdc++fs ; -lib mcpp ; +lib slice-parser ; lib slicer-compiler : parser.cpp : - <library>slice//Slice + <library>slice-parser <library>..//Ice++11 - <library>mcpp <library>stdc++fs <library>..//adhocutil <library>../slicer//slicer diff --git a/slicer/tool/slice/Jamroot.jam b/slicer/tool/slice/Jamroot.jam deleted file mode 100644 index 612cdf0..0000000 --- a/slicer/tool/slice/Jamroot.jam +++ /dev/null @@ -1,28 +0,0 @@ -path-constant ice : ../../../ice ; - -project ice : - requirements - <cxxstd>11 - <warnings>off - <include>$(ice)/cpp/src - <toolset>tidy:<checker>none - <coverage>off - ; - -obj Parser : $(ice)/cpp/src/Slice/Parser.cpp ; -obj Grammar : $(ice)/cpp/src/Slice/Grammar.cpp ; -obj Preprocessor : $(ice)/cpp/src/Slice/Preprocessor.cpp ; -obj CPlusPlusUtil : $(ice)/cpp/src/Slice/CPlusPlusUtil.cpp ; -obj SliceUtil : $(ice)/cpp/src/Slice/SliceUtil.cpp ; -obj FileTracker : $(ice)/cpp/src/Slice/FileTracker.cpp ; -obj Scanner : $(ice)/cpp/src/Slice/Scanner.cpp ; - -alias Slice : - Parser Grammar Preprocessor - CPlusPlusUtil SliceUtil FileTracker - Scanner - : : : - <include>$(ice)/cpp/src - <include>$(ice)/cpp/include - ; - |