don't use VCToolsFile anymore because of different include dirs for subprojects
authorChristoph von Wittich <christoph_vw@reactos.org>
Sun, 8 Jan 2006 00:48:28 +0000 (00:48 +0000)
committerChristoph von Wittich <christoph_vw@reactos.org>
Sun, 8 Jan 2006 00:48:28 +0000 (00:48 +0000)
svn path=/trunk/; revision=20690

reactos/tools/rbuild/backend/msvc/msvc.cpp
reactos/tools/rbuild/backend/msvc/msvc.h
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp

index 83421e0..e7581bf 100644 (file)
@@ -54,19 +54,19 @@ MSVCBackend::MSVCBackend(Project &project,
 void MSVCBackend::Process()\r
 {\r
        string filename_sln ( ProjectNode.name );\r
-       string filename_rules = "gccasm.rules";\r
+       //string filename_rules = "gccasm.rules";\r
        \r
        if ( configuration.VSProjectVersion == "6.00" )\r
                filename_sln += ".dsw";\r
        else {\r
                filename_sln += ".sln";\r
 \r
-               m_rulesFile = fopen ( filename_rules.c_str(), "wb" );\r
-               if ( m_rulesFile )\r
-               {\r
-                       _generate_rules_file ( m_rulesFile );\r
-               }\r
-               fclose ( m_rulesFile );\r
+               //m_rulesFile = fopen ( filename_rules.c_str(), "wb" );\r
+               //if ( m_rulesFile )\r
+               //{\r
+               //      _generate_rules_file ( m_rulesFile );\r
+               //}\r
+               //fclose ( m_rulesFile );\r
        }\r
 \r
        printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() );\r
index bf8b9b6..6d19353 100644 (file)
@@ -92,7 +92,7 @@ class MSVCBackend : public Backend
                void _generate_sln_header ( FILE* OUT );\r
                void _generate_sln_footer ( FILE* OUT );\r
                void _generate_sln ( FILE* OUT );\r
-               void _generate_rules_file ( FILE* OUT );\r
+               //void _generate_rules_file ( FILE* OUT );\r
                void _generate_sln_project (\r
                        FILE* OUT,\r
                        const Module& module,\r
index 91756b3..e89efb2 100644 (file)
@@ -493,7 +493,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                                fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );\r
                        }\r
 \r
-                       if (configuration.VSProjectVersion < "8.00") {\r
+                       //if (configuration.VSProjectVersion < "8.00") {\r
                                if ((source_file.find(".idl") != string::npos) || ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')))\r
                                {\r
                                        fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" );\r
@@ -514,7 +514,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                                        }\r
                                        fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );\r
                                }\r
-                       }\r
+                       //}\r
                }\r
                fprintf ( OUT, "\t\t\t</File>\r\n" );\r
        }\r
@@ -588,29 +588,29 @@ MSVCBackend::_get_solution_verion ( void ) {
 }\r
 \r
 \r
-void\r
-MSVCBackend::_generate_rules_file ( FILE* OUT )\r
-{\r
-       fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" );\r
-       fprintf ( OUT, "<VisualStudioToolFile\r\n" );\r
-       fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" );\r
-       fprintf ( OUT, "\tVersion=\"%s\"\r\n", _get_solution_verion().c_str() );\r
-       fprintf ( OUT, "\t>\r\n" );\r
-       fprintf ( OUT, "\t<Rules>\r\n" );\r
-       fprintf ( OUT, "\t\t<CustomBuildRule\r\n" );\r
-       fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" );\r
-       fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" );\r
-       fprintf ( OUT, "\t\t\tCommandLine=\"cl /E &quot;$(InputPath)&quot; | as -o &quot;$(OutDir)\\$(InputName).obj&quot;\"\r\n" );\r
-       fprintf ( OUT, "\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" );   \r
-       fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" );\r
-       fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" );\r
-       fprintf ( OUT, "\t\t\t>\r\n" );\r
-       fprintf ( OUT, "\t\t\t<Properties>\r\n" );\r
-       fprintf ( OUT, "\t\t\t</Properties>\r\n" );\r
-       fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" );\r
-       fprintf ( OUT, "\t</Rules>\r\n" );\r
-       fprintf ( OUT, "</VisualStudioToolFile>\r\n" );\r
-}\r
+//void\r
+//MSVCBackend::_generate_rules_file ( FILE* OUT )\r
+//{\r
+//     fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" );\r
+//     fprintf ( OUT, "<VisualStudioToolFile\r\n" );\r
+//     fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" );\r
+//     fprintf ( OUT, "\tVersion=\"%s\"\r\n", _get_solution_verion().c_str() );\r
+//     fprintf ( OUT, "\t>\r\n" );\r
+//     fprintf ( OUT, "\t<Rules>\r\n" );\r
+//     fprintf ( OUT, "\t\t<CustomBuildRule\r\n" );\r
+//     fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" );\r
+//     fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" );\r
+//     fprintf ( OUT, "\t\t\tCommandLine=\"cl /E &quot;$(InputPath)&quot; | as -o &quot;$(OutDir)\\$(InputName).obj&quot;\"\r\n" );\r
+//     fprintf ( OUT, "\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" );   \r
+//     fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" );\r
+//     fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" );\r
+//     fprintf ( OUT, "\t\t\t>\r\n" );\r
+//     fprintf ( OUT, "\t\t\t<Properties>\r\n" );\r
+//     fprintf ( OUT, "\t\t\t</Properties>\r\n" );\r
+//     fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" );\r
+//     fprintf ( OUT, "\t</Rules>\r\n" );\r
+//     fprintf ( OUT, "</VisualStudioToolFile>\r\n" );\r
+//}\r
 \r
 void\r
 MSVCBackend::_generate_sln_header ( FILE* OUT )\r