From 61583dabbed114951b894d3bca1fa63abbbb9917 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Tue, 7 Aug 2007 21:19:22 +0000
Subject: [PATCH] add support for Visual Studio 2008 (Orcas)

svn path=/trunk/; revision=28228
---
 reactos/Makefile                                  | 10 ++++++++++
 reactos/tools/rbuild/backend/msvc/msvc.cpp        |  2 ++
 reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp |  9 +++++++++
 3 files changed, 21 insertions(+)

diff --git a/reactos/Makefile b/reactos/Makefile
index d3a85aae112..9e6ad6b98d0 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -523,6 +523,11 @@ msvc8: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc
 
+.PHONY: msvc9
+msvc9: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc
+
 .PHONY: msvc6_clean
 msvc6_clean: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
@@ -543,6 +548,11 @@ msvc8_clean: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc
 
+.PHONY: msvc9_clean
+msvc9_clean: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc
+
 .PHONY: msvc_clean
 msvc_clean: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
diff --git a/reactos/tools/rbuild/backend/msvc/msvc.cpp b/reactos/tools/rbuild/backend/msvc/msvc.cpp
index d98b51d7aa7..80ba9ff214a 100644
--- a/reactos/tools/rbuild/backend/msvc/msvc.cpp
+++ b/reactos/tools/rbuild/backend/msvc/msvc.cpp
@@ -285,6 +285,8 @@ std::string MSVCBackend::_get_vc_dir ( void ) const
 		return "vc70";
 	else if ( configuration.VSProjectVersion == "7.10" )
 		return "vc71";
+	else if ( configuration.VSProjectVersion == "9.00" )
+		return "vc9";
 	else /* must be VS2005 */
 		return "vc8";
 
diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
index 06266fbc99a..931dbab36f3 100644
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -417,6 +417,12 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 			if (module.GetEntryPoint(false) == "0")
 				fprintf ( OUT, "AdditionalOptions=\"/noentry\"" );
 
+			if (configuration.VSProjectVersion == "9.00")
+			{
+				fprintf ( OUT, "\t\t\t\tRandomizedBaseAddress=\"0\"\r\n" );
+				fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" );
+			}
+
 			if (module.importLibrary != NULL)
 				fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str());
 			fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" );
@@ -777,6 +783,9 @@ MSVCBackend::_get_solution_version ( void )
 	if (configuration.VSProjectVersion == "8.00")
 		version = "9.00";
 
+	if (configuration.VSProjectVersion == "9.00")
+		version = "10.00";
+
 	return version;
 }