add targets for creating MSVC project files to Makefile

fix bug in msvc backend: VS.NET project files are not destroyed anymore when creating VC6 project files

svn path=/trunk/; revision=18632

diff --git a/reactos/Makefile b/reactos/Makefile
index 4e5cc0f..35d8b9a 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -321,6 +321,26 @@ $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC)
        $(ECHO_WMC)
        $(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC)
 
+.PHONY: msvc6
+msvc6: $(RBUILD_TARGET)
+       $(ECHO_RBUILD)
+       $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc
+
+.PHONY: msvc7
+msvc7: $(RBUILD_TARGET)
+       $(ECHO_RBUILD)
+       $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc
+
+.PHONY: msvc71
+msvc71: $(RBUILD_TARGET)
+       $(ECHO_RBUILD)
+       $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc
+
+.PHONY: msvc8
+msvc8: $(RBUILD_TARGET)
+       $(ECHO_RBUILD)
+       $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc
+
 .PHONY: makefile_auto_clean
 makefile_auto_clean:
        -@$(rm) makefile.auto $(PREAUTO) 2>$(NUL)

diff --git a/reactos/tools/rbuild/backend/msvc/msvc.cpp b/reactos/tools/rbuild/backend/msvc/msvc.cpp
index 4ddc2a1..ba52451 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/msvc.cpp
+++ b/reactos/tools/rbuild/backend/msvc/msvc.cpp
@@ -53,34 +53,39 @@ MSVCBackend::MSVCBackend(Project &project,
 \r
 void MSVCBackend::Process()\r
 {\r
+\r
        string filename_dsw = ProjectNode.name + ".dsw";\r
        string filename_sln = ProjectNode.name + ".sln";\r
-       \r
-       printf ( "Creating MSVC workspace: %s\n", filename_dsw.c_str() );\r
-       printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() );\r
 \r
+       if (configuration.VSProjectVersion == "6.00")\r
+               printf ( "Creating MSVC workspace: %s\n", filename_dsw.c_str() );\r
+       else\r
+               printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() );\r
+       \r
        ProcessModules();\r
 \r
-       m_dswFile = fopen ( filename_dsw.c_str(), "wb" );\r
-       m_slnFile = fopen ( filename_sln.c_str(), "wb" );\r
+       if (configuration.VSProjectVersion == "6.00") { \r
+               m_dswFile = fopen ( filename_dsw.c_str(), "wb" );\r
 \r
-       if ( !m_dswFile )\r
-       {\r
-               printf ( "Could not create file '%s'.\n", filename_dsw.c_str() );\r
-               return;\r
+               if ( !m_dswFile )\r
+               {\r
+                       printf ( "Could not create file '%s'.\n", filename_dsw.c_str() );\r
+                       return;\r
+               }\r
+               _generate_wine_dsw ( m_dswFile );\r
+               fclose ( m_dswFile );\r
        }\r
-       _generate_wine_dsw ( m_dswFile );\r
-\r
-\r
-       if ( !m_slnFile )\r
-       {\r
-               printf ( "Could not create file '%s'.\n", filename_sln.c_str() );\r
-               return;\r
+       else {\r
+               m_slnFile = fopen ( filename_sln.c_str(), "wb" );\r
+       \r
+               if ( !m_slnFile )\r
+               {\r
+                       printf ( "Could not create file '%s'.\n", filename_sln.c_str() );\r
+                       return;\r
+               }\r
+               _generate_sln ( m_slnFile );\r
+               fclose ( m_slnFile );\r
        }\r
-       _generate_sln ( m_slnFile );\r
-\r
-       fclose ( m_dswFile );\r
-       fclose ( m_slnFile );\r
 \r
        printf ( "Done.\n" );\r
 }\r