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 /astra_vc11.vcxproj | |
| 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 'astra_vc11.vcxproj')
| -rw-r--r-- | astra_vc11.vcxproj | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/astra_vc11.vcxproj b/astra_vc11.vcxproj index bc11b23..fc8b9ce 100644 --- a/astra_vc11.vcxproj +++ b/astra_vc11.vcxproj @@ -380,6 +380,7 @@ <ClCompile Include="src\AsyncAlgorithm.cpp" /> <ClCompile Include="src\BackProjectionAlgorithm.cpp" /> <ClCompile Include="src\CglsAlgorithm.cpp" /> + <ClCompile Include="src\CompositeGeometryManager.cpp" /> <ClCompile Include="src\ConeProjectionGeometry3D.cpp" /> <ClCompile Include="src\ConeVecProjectionGeometry3D.cpp" /> <ClCompile Include="src\Config.cpp" /> @@ -582,6 +583,7 @@ <ClInclude Include="cuda\3d\darthelper3d.h" /> <ClInclude Include="cuda\3d\dims3d.h" /> <ClInclude Include="cuda\3d\fdk.h" /> + <ClInclude Include="cuda\3d\mem3d.h" /> <ClInclude Include="cuda\3d\par3d_bp.h" /> <ClInclude Include="cuda\3d\par3d_fp.h" /> <ClInclude Include="cuda\3d\sirt3d.h" /> @@ -594,6 +596,7 @@ <ClInclude Include="include\astra\AsyncAlgorithm.h" /> <ClInclude Include="include\astra\BackProjectionAlgorithm.h" /> <ClInclude Include="include\astra\CglsAlgorithm.h" /> + <ClInclude Include="include\astra\CompositeGeometryManager.h" /> <ClInclude Include="include\astra\ConeProjectionGeometry3D.h" /> <ClInclude Include="include\astra\ConeVecProjectionGeometry3D.h" /> <ClInclude Include="include\astra\Config.h" /> @@ -804,6 +807,12 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </CudaCompile> + <CudaCompile Include="cuda\3d\mem3d.cu"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </CudaCompile> <CudaCompile Include="cuda\3d\par3d_bp.cu"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> |