diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-12-04 16:04:58 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-12-04 16:04:58 +0100 |
| commit | b6891106eb167e7399a88efe858abccb8b3dd0c0 (patch) | |
| tree | a92a3f08ec3a4ed7751ec5ae563f217bd8614731 /build | |
| parent | 7ba1ff9ff08daf043cc131434373cde38434f46b (diff) | |
| parent | e07449189a05e3bcdc8ad4a9fbb95c0751f567bb (diff) | |
| download | astra-b6891106eb167e7399a88efe858abccb8b3dd0c0.tar.gz astra-b6891106eb167e7399a88efe858abccb8b3dd0c0.tar.bz2 astra-b6891106eb167e7399a88efe858abccb8b3dd0c0.tar.xz astra-b6891106eb167e7399a88efe858abccb8b3dd0c0.zip | |
Merge pull request #101 from wjp/composite
Add CompositeGeometryManager
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/Makefile.in | 4 | ||||
| -rw-r--r-- | build/msvc/gen.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index bdffd4c..0361e97 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -105,6 +105,7 @@ BASE_OBJECTS=\ src/AstraObjectManager.lo \ src/BackProjectionAlgorithm.lo \ src/CglsAlgorithm.lo \ + src/CompositeGeometryManager.lo \ src/ConeProjectionGeometry3D.lo \ src/ConeVecProjectionGeometry3D.lo \ src/Config.lo \ @@ -203,7 +204,8 @@ CUDA_OBJECTS=\ cuda/3d/sirt3d.lo \ cuda/3d/astra3d.lo \ cuda/3d/util3d.lo \ - cuda/3d/arith3d.lo + cuda/3d/arith3d.lo \ + cuda/3d/mem3d.lo ALL_OBJECTS=$(BASE_OBJECTS) ifeq ($(cuda),yes) diff --git a/build/msvc/gen.py b/build/msvc/gen.py index 72d4582..c18c1e8 100644 --- a/build/msvc/gen.py +++ b/build/msvc/gen.py @@ -168,6 +168,7 @@ P_astra["filters"]["CUDA\\cuda source"] = [ "cuda\\3d\\cone_fp.cu", "cuda\\3d\\darthelper3d.cu", "cuda\\3d\\fdk.cu", +"cuda\\3d\\mem3d.cu", "cuda\\3d\\par3d_bp.cu", "cuda\\3d\\par3d_fp.cu", "cuda\\3d\\sirt3d.cu", @@ -205,6 +206,7 @@ P_astra["filters"]["Global & Other\\source"] = [ "1546cb47-7e5b-42c2-b695-ef172024c14b", "src\\AstraObjectFactory.cpp", "src\\AstraObjectManager.cpp", +"src\\CompositeGeometryManager.cpp", "src\\Config.cpp", "src\\Fourier.cpp", "src\\Globals.cpp", @@ -295,6 +297,7 @@ P_astra["filters"]["CUDA\\cuda headers"] = [ "cuda\\3d\\darthelper3d.h", "cuda\\3d\\dims3d.h", "cuda\\3d\\fdk.h", +"cuda\\3d\\mem3d.h", "cuda\\3d\\par3d_bp.h", "cuda\\3d\\par3d_fp.h", "cuda\\3d\\sirt3d.h", @@ -336,6 +339,7 @@ P_astra["filters"]["Global & Other\\headers"] = [ "include\\astra\\AstraObjectFactory.h", "include\\astra\\AstraObjectManager.h", "include\\astra\\clog.h", +"include\\astra\\CompositeGeometryManager.h", "include\\astra\\Config.h", "include\\astra\\Fourier.h", "include\\astra\\Globals.h", |