diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-07-28 17:05:24 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-07-28 17:05:24 +0200 |
| commit | b2611a03577c285ddf48edab0d05dafa09ab362c (patch) | |
| tree | c1d2f1b5166ba23f55e68e8faf0832f7c540f787 /astra_vc09.vcproj | |
| parent | 1ff4a270a7df1edb54dd91fe653d6a936b959b3a (diff) | |
| parent | 53249b3ad63f0d08b9862a75602acf263d230d77 (diff) | |
| download | astra-b2611a03577c285ddf48edab0d05dafa09ab362c.tar.gz astra-b2611a03577c285ddf48edab0d05dafa09ab362c.tar.bz2 astra-b2611a03577c285ddf48edab0d05dafa09ab362c.tar.xz astra-b2611a03577c285ddf48edab0d05dafa09ab362c.zip | |
Merge branch 'master' into parvec
Diffstat (limited to 'astra_vc09.vcproj')
| -rw-r--r-- | astra_vc09.vcproj | 80 |
1 files changed, 72 insertions, 8 deletions
diff --git a/astra_vc09.vcproj b/astra_vc09.vcproj index a56e4bc..f2cf62a 100644 --- a/astra_vc09.vcproj +++ b/astra_vc09.vcproj @@ -102,7 +102,8 @@ Arch3="35" TargetMachinePlatform="0" Runtime="3" - Defines="-DASTRA_CUDA -DDLL_EXPORTS" + ExtraCppOptions="-Iinclude -Ilib/include" + Defines="ASTRA_CUDA;DLL_EXPORTS" /> </Configuration> <Configuration @@ -186,7 +187,8 @@ Arch3="35" TargetMachinePlatform="1" Runtime="3" - Defines="-DASTRA_CUDA -DDLL_EXPORTS" + ExtraCppOptions="-Iinclude -Ilib/include" + Defines="ASTRA_CUDA;DLL_EXPORTS" /> </Configuration> <Configuration @@ -270,7 +272,8 @@ Arch3="35" TargetMachinePlatform="0" Runtime="3" - Defines="-DDLL_EXPORTS" + ExtraCppOptions="-Iinclude -Ilib/include" + Defines="DLL_EXPORTS" /> </Configuration> <Configuration @@ -353,7 +356,8 @@ Arch3="35" TargetMachinePlatform="1" Runtime="3" - Defines="-DDLL_EXPORTS" + ExtraCppOptions="-Iinclude -Ilib/include" + Defines="DLL_EXPORTS" /> </Configuration> <Configuration @@ -435,7 +439,8 @@ Arch3="35" TargetMachinePlatform="0" Runtime="2" - Defines="-DASTRA_CUDA -DDLL_EXPORTS" + ExtraCppOptions="-Iinclude -Ilib/include" + Defines="ASTRA_CUDA;DLL_EXPORTS" /> </Configuration> <Configuration @@ -516,7 +521,8 @@ Arch3="35" TargetMachinePlatform="1" Runtime="2" - Defines="-DASTRA_CUDA -DDLL_EXPORTS" + ExtraCppOptions="-Iinclude -Ilib/include" + Defines="ASTRA_CUDA;DLL_EXPORTS" /> </Configuration> <Configuration @@ -597,7 +603,8 @@ Arch3="35" TargetMachinePlatform="0" Runtime="2" - Defines="-DDLL_EXPORTS" + ExtraCppOptions="-Iinclude -Ilib/include" + Defines="DLL_EXPORTS" /> </Configuration> <Configuration @@ -677,7 +684,8 @@ Arch3="35" TargetMachinePlatform="1" Runtime="2" - Defines="-DDLL_EXPORTS" + ExtraCppOptions="-Iinclude -Ilib/include" + Defines="DLL_EXPORTS" /> </Configuration> </Configurations> @@ -741,6 +749,10 @@ > </File> <File + RelativePath=".\include\astra\PluginAlgorithm.h" + > + </File> + <File RelativePath=".\include\astra\ReconstructionAlgorithm2D.h" > </File> @@ -789,6 +801,10 @@ > </File> <File + RelativePath=".\src\PluginAlgorithm.cpp" + > + </File> + <File RelativePath=".\src\ReconstructionAlgorithm2D.cpp" > </File> @@ -925,6 +941,10 @@ > </File> <File + RelativePath=".\include\astra\CompositeGeometryManager.h" + > + </File> + <File RelativePath=".\include\astra\Config.h" > </File> @@ -981,6 +1001,10 @@ > </File> <File + RelativePath=".\src\CompositeGeometryManager.cpp" + > + </File> + <File RelativePath=".\src\Config.cpp" > </File> @@ -2221,6 +2245,10 @@ > </File> <File + RelativePath=".\cuda\3d\mem3d.h" + > + </File> + <File RelativePath=".\cuda\3d\par3d_bp.h" > </File> @@ -3033,6 +3061,42 @@ </FileConfiguration> </File> <File + RelativePath=".\cuda\3d\mem3d.cu" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="Cudart Build Rule" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + ExcludedFromBuild="true" + > + <Tool + Name="Cudart Build Rule" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="Cudart Build Rule" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + ExcludedFromBuild="true" + > + <Tool + Name="Cudart Build Rule" + /> + </FileConfiguration> + </File> + <File RelativePath=".\cuda\3d\par3d_bp.cu" > <FileConfiguration |