fixing OutputFile in *.vcproj files

[reactos.git] / reactos / tools / rbuild / backend / msvc / vcprojmaker.cpp

diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
index 1f2c300..7bba279 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -31,6 +31,10 @@
 using std::string;\r
 using std::vector;\r
 \r
+#ifdef OUT\r
+#undef OUT\r
+#endif//OUT\r
+\r
 void\r
 MSVCBackend::_generate_vcproj ( const Module& module )\r
 {\r
@@ -280,7 +284,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                {\r
                        fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
                        fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" );\r
-                       fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"/>\r\n", module.name.c_str(), module_type.c_str() );\r
+                       fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"/>\r\n", module.name.c_str(), module_type.c_str() );\r
                }\r
                else\r
                {\r
@@ -296,7 +300,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                        }\r
                        fprintf ( OUT, "\"\r\n" );\r
 \r
-                       fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"\r\n", module.name.c_str(), module_type.c_str() );\r
+                       fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"\r\n", module.name.c_str(), module_type.c_str() );\r
                        fprintf ( OUT, "\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 );\r
                        fprintf ( OUT, "\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" );\r
 \r
@@ -415,13 +419,13 @@ MSVCBackend::_generate_sln_header ( FILE* OUT )
     string version;\r
 \r
     if (configuration.VSProjectVersion == "7.00")\r
-       version = "7.00";\r
+               version = "7.00";\r
 \r
     if (configuration.VSProjectVersion == "7.10")\r
-       version = "8.00";\r
+               version = "8.00";\r
 \r
     if (configuration.VSProjectVersion == "8.00")\r
-       version = "9.00";\r
+               version = "9.00";\r
 \r
     fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", version.c_str() );\r
     fprintf ( OUT, "# Visual Studio 2005\r\n" );\r
@@ -441,8 +445,14 @@ MSVCBackend::_generate_sln_project (
        vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file );\r
 \r
        fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"%s\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() );\r
-       fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" );\r
-       fprintf ( OUT, "\tEndProjectSection\r\n" );\r
+\r
+       //FIXME: only omit ProjectDependencies in VS 2005 when there are no dependencies\r
+       //NOTE: VS 2002 do not use ProjectSection; it uses GlobalSection instead\r
+       if (configuration.VSProjectVersion == "7.10") {\r
+               fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" );\r
+               fprintf ( OUT, "\tEndProjectSection\r\n" );\r
+       }\r
+\r
        fprintf ( OUT, "EndProject\r\n" );\r
 }\r
 \r
@@ -467,10 +477,21 @@ MSVCBackend::_generate_sln_footer ( FILE* OUT )
        fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
        fprintf ( OUT, "\tGlobalSection(ExtensibilityAddIns) = postSolution\r\n" );\r
        fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
-       fprintf ( OUT, "EndGlobal\r\n" );\r
 \r
+       \r
+       if (configuration.VSProjectVersion == "7.00") {\r
+               fprintf ( OUT, "\tGlobalSection(ProjectDependencies) = postSolution\r\n" );\r
+               fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
+       }\r
 \r
-    fprintf ( OUT, "\r\n" );\r
+       if (configuration.VSProjectVersion == "8.00") {\r
+               fprintf ( OUT, "\tGlobalSection(SolutionProperties) = preSolution\r\n" );\r
+               fprintf ( OUT, "\t\tHideSolutionNode = FALSE\r\n" );\r
+               fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
+       }\r
+\r
+       fprintf ( OUT, "EndGlobal\r\n" );\r
+       fprintf ( OUT, "\r\n" );\r
 }\r
 \r
 \r