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 ++++++++++++++++--------
 build/msvc/gen.py |  5 +++--
 2 files changed, 19 insertions(+), 10 deletions(-)

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>
diff --git a/build/msvc/gen.py b/build/msvc/gen.py
index 9f5e367..aeca3b0 100644
--- a/build/msvc/gen.py
+++ b/build/msvc/gen.py
@@ -946,10 +946,11 @@ def write_main_project09():
       print('\t\t\t\tRuntime="3"', file=F) # MDD
     else:
       print('\t\t\t\tRuntime="2"', file=F) # MD
+    print('\t\t\t\tExtraCppOptions="-Iinclude -Ilib/include"', file=F)
     if c.cuda:
-      print('\t\t\t\tDefines="-DASTRA_CUDA -DDLL_EXPORTS"', file=F)
+      print('\t\t\t\tDefines="ASTRA_CUDA;DLL_EXPORTS"', file=F)
     else: # This 'else' doesn't make much sense
-      print('\t\t\t\tDefines="-DDLL_EXPORTS"', file=F)
+      print('\t\t\t\tDefines="DLL_EXPORTS"', file=F)
     # TODO!!!
     print('\t\t\t/>', file=F)
     print('\t\t</Configuration>', file=F)
-- 
cgit v1.2.3