diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-12-04 16:35:00 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-12-04 16:35:00 +0100 |
| commit | f3ac1849f2b141ea1845752e1ca2317845e90e3a (patch) | |
| tree | adcdc9013af5cca4165857408ed7181ffdf0de64 /astra_vc11.vcxproj | |
| parent | 8144bf0397ee1913b830d82058ccd40df741f1b3 (diff) | |
| parent | 0d015b1c91581ee5ef3e936f03e4c62fbc7ea362 (diff) | |
| download | astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.tar.gz astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.tar.bz2 astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.tar.xz astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.zip | |
Merge branch 'master'
Diffstat (limited to 'astra_vc11.vcxproj')
| -rw-r--r-- | astra_vc11.vcxproj | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/astra_vc11.vcxproj b/astra_vc11.vcxproj index bc11b23..d050b96 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" /> @@ -539,6 +540,7 @@ <ClCompile Include="src\ParallelProjectionGeometry3D.cpp" /> <ClCompile Include="src\ParallelVecProjectionGeometry3D.cpp" /> <ClCompile Include="src\PlatformDepSystemCode.cpp" /> + <ClCompile Include="src\PluginAlgorithm.cpp" /> <ClCompile Include="src\ProjectionGeometry2D.cpp" /> <ClCompile Include="src\ProjectionGeometry3D.cpp" /> <ClCompile Include="src\Projector2D.cpp" /> @@ -582,6 +584,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 +597,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" /> @@ -649,6 +653,7 @@ <ClInclude Include="include\astra\ParallelProjectionGeometry3D.h" /> <ClInclude Include="include\astra\ParallelVecProjectionGeometry3D.h" /> <ClInclude Include="include\astra\PlatformDepSystemCode.h" /> + <ClInclude Include="include\astra\PluginAlgorithm.h" /> <ClInclude Include="include\astra\ProjectionGeometry2D.h" /> <ClInclude Include="include\astra\ProjectionGeometry3D.h" /> <ClInclude Include="include\astra\Projector2D.h" /> @@ -804,6 +809,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> |