From 33467f990312c393e5d4113fe86a3c850c66e4b7 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 29 May 2015 13:13:59 +0200
Subject: Fix vs2008 build

---
 astra_vc09.vcproj | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'astra_vc09.vcproj')

diff --git a/astra_vc09.vcproj b/astra_vc09.vcproj
index a56e4bc..e5d7731 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>
-- 
cgit v1.2.3


From b14fb531ad9ae3d565f2cf28f5506408ab10dbed Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 18 Nov 2015 11:26:15 +0100
Subject: Add CompositeGeometryManager

This handles FP and BP operations on multiple data objects at once,
splitting them to fit in GPU memory where necessary.
---
 astra_vc09.vcproj | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'astra_vc09.vcproj')

diff --git a/astra_vc09.vcproj b/astra_vc09.vcproj
index e5d7731..b928662 100644
--- a/astra_vc09.vcproj
+++ b/astra_vc09.vcproj
@@ -932,6 +932,10 @@
 					RelativePath=".\include\astra\clog.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\astra\CompositeGeometryManager.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\astra\Config.h"
 					>
@@ -988,6 +992,10 @@
 					RelativePath=".\src\AstraObjectManager.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\CompositeGeometryManager.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\Config.cpp"
 					>
@@ -2228,6 +2236,10 @@
 					RelativePath=".\cuda\3d\fdk.h"
 					>
 				</File>
+				<File
+					RelativePath=".\cuda\3d\mem3d.h"
+					>
+				</File>
 				<File
 					RelativePath=".\cuda\3d\par3d_bp.h"
 					>
@@ -3040,6 +3052,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"
 					>
-- 
cgit v1.2.3


From 0d015b1c91581ee5ef3e936f03e4c62fbc7ea362 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 4 Dec 2015 16:34:44 +0100
Subject: Update Windows build files

---
 astra_vc09.vcproj | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'astra_vc09.vcproj')

diff --git a/astra_vc09.vcproj b/astra_vc09.vcproj
index b928662..f2cf62a 100644
--- a/astra_vc09.vcproj
+++ b/astra_vc09.vcproj
@@ -748,6 +748,10 @@
 					RelativePath=".\include\astra\ForwardProjectionAlgorithm.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\astra\PluginAlgorithm.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\astra\ReconstructionAlgorithm2D.h"
 					>
@@ -796,6 +800,10 @@
 					RelativePath=".\src\ForwardProjectionAlgorithm.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\PluginAlgorithm.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\ReconstructionAlgorithm2D.cpp"
 					>
-- 
cgit v1.2.3