summaryrefslogtreecommitdiffstats
path: root/build/linux
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2015-03-02 14:42:34 +0100
committerWillem Jan Palenstijn <wjp@usecode.org>2015-03-02 14:42:34 +0100
commite468c6c546dbb4d9665ccb95b1571a160753d50e (patch)
tree0c0544cb4e9f892523b2aed581c7a56510383595 /build/linux
parent24a2b2b0a6a354efd58774a4bce930cb9f90334f (diff)
parentbf5aa06406162656752f031edf3ca90f00ff76dd (diff)
downloadastra-e468c6c546dbb4d9665ccb95b1571a160753d50e.tar.gz
astra-e468c6c546dbb4d9665ccb95b1571a160753d50e.tar.bz2
astra-e468c6c546dbb4d9665ccb95b1571a160753d50e.tar.xz
astra-e468c6c546dbb4d9665ccb95b1571a160753d50e.zip
Merge pull request #24 from wjp/cuda_includes
Untangle cuda and astra includes
Diffstat (limited to 'build/linux')
-rw-r--r--build/linux/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 6620446..cd5e74b 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -116,6 +116,7 @@ BASE_OBJECTS=\
src/Float32VolumeData3DMemory.lo \
src/ForwardProjectionAlgorithm.lo \
src/Fourier.lo \
+ src/GeometryUtil3D.lo \
src/Globals.lo \
src/Logger.lo \
src/ParallelBeamBlobKernelProjector2D.lo \
@@ -185,7 +186,6 @@ CUDA_OBJECTS=\
cuda/3d/cgls3d.lo \
cuda/3d/cone_fp.lo \
cuda/3d/cone_bp.lo \
- cuda/3d/dims3d.lo \
cuda/3d/fdk.lo \
cuda/3d/par3d_fp.lo \
cuda/3d/par3d_bp.lo \