projects / reactos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
don't use VCToolsFile anymore because of different include dirs for subprojects
[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 c39f840..e89efb2 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -96,9 +96,10 @@ MSVCBackend::_generate_vcproj ( const Module& module )
        ifs_list.push_back ( &module.project.non_if_data );\r
        ifs_list.push_back ( &module.non_if_data );\r
 \r
-       // this is a define in MinGW w32api, but not Microsoft's headers\r
+       // MinGW doesn't have a safe-string library yet\r
        defines.push_back ( "_CRT_SECURE_NO_DEPRECATE" );\r
        defines.push_back ( "_CRT_NON_CONFORMING_SWPRINTFS" );\r
+       // this is a define in MinGW w32api, but not Microsoft's headers\r
        defines.push_back ( "STDCALL=__stdcall" );\r
 \r
        string baseaddr;\r
@@ -243,8 +244,8 @@ MSVCBackend::_generate_vcproj ( const Module& module )
        {\r
                std::string& cfg = cfgs[icfg];\r
 \r
-               bool debug = strstr ( cfg.c_str(), "Debug" );\r
-               bool speed = strstr ( cfg.c_str(), "Speed" );\r
+               bool debug = strstr ( cfg.c_str(), "Debug" ) != NULL;\r
+               bool speed = strstr ( cfg.c_str(), "Speed" ) != NULL;\r
                bool release = (!debug && !speed );\r
 \r
                //bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) );\r
@@ -309,9 +310,9 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                fprintf ( OUT, "\"\r\n" );\r
 \r
                fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" );\r
-               fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", debug ? "3" : "0" );\r
+        fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ? "3" : "0") );\r
                fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" );\r
-               fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" );\r
+        fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", sys ? "FALSE" : (debug ? "TRUE" : "FALSE" ));\r
                fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" );\r
                \r
                if ( module.pch != NULL )\r
@@ -335,11 +336,12 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                }\r
 \r
                fprintf ( OUT, "\t\t\t\tEnablePREfast=\"%s\"\r\n", debug ? "TRUE" : "FALSE");\r
-               fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127\"\r\n" );\r
-               fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" );\r
-               fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE");\r
+               fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127;4214\"\r\n" );\r
+               fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "4" );\r
+               fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", speed ? "FALSE" : "TRUE");\r
                if ( !module.cplusplus )\r
                        fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" );\r
+        fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", (sys || (exe && module.type == Kernel)) ? 2: 1);\r
                fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4");\r
 \r
                fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
@@ -384,31 +386,39 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 \r
                        if ( sys )\r
                        {\r
-                               fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /DRIVER /ALIGN:0x20 /SUBSYSTEM:NATIVE /SECTION:INIT,D /NODEFAULTLIB /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" );\r
+                               fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" );\r
                                fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );\r
+                               fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" );\r
+                               fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 );\r
+                               fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 );\r
                                fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ());\r
                                fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ());       \r
                        }\r
                        else if ( exe )\r
                        {\r
                                if ( module.type == Kernel )\r
-                               {\r
-                                       fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /SECTION:INIT,D /ALIGN:0x80\"\r\n" );\r
-                                       fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );\r
+                               {\r
+                                       fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" );\r
+                                       fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );\r
+                                       fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" );\r
+                                       fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 );\r
+                                       fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 );\r
                                        fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" );\r
                                        fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ());    \r
-                               }\r
+                               }\r
                                else if ( module.type == NativeCUI )\r
                                {\r
-                                       fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /ALIGN:0x20\"\r\n" );\r
-                                       fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );\r
+                                       fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" );\r
+                                       fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 );\r
+                                       fprintf ( OUT, "\t\t\t\tGenerateManifest=\"FALSE\"\r\n" );\r
+                                       fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );\r
                                        fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" );\r
                                        fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ());    \r
                                }\r
                                else if ( module.type == Win32CUI || module.type == Win32GUI )\r
-                               {\r
-                                       fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 );\r
-                               }\r
+                               {\r
+                                       fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 );\r
+                               }\r
                        }\r
                        else if ( dll )\r
                        {\r
@@ -483,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
@@ -504,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
@@ -578,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
A free Windows-compatible Operating System