[ros-diffs] [greatlrd] 22986: putting back Christoph_vW patch that was revert by me

Author: greatlrd
Date: Mon Jul 10 05:33:10 2006
New Revision: 22986
URL: http://svn.reactos.org/svn/reactos?rev=22986&view=rev
Log:
putting back Christoph_vW patch that was revert by me
Modified:
    trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Jul 10 05:33:10 2006
@@ -371,6 +371,9 @@
                {
                        fprintf ( OUT, "\t\t\t<Tool\r\n" );
                        fprintf ( OUT,
"\t\t\t\tName=\"VCLinkerTool\"\r\n" );
+                       if (module.GetEntryPoint(false) == "0")
+                               fprintf ( OUT,
"AdditionalOptions=\"/noentry\"" );
+
                        if (module.importLibrary != NULL)
                                fprintf ( OUT,
"\t\t\t\tModuleDefinitionFile=\"%s\"\r\n",
module.importLibrary->definition.c_str());
                        fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\""
);
@@ -443,7 +446,10 @@
                        }
                        else if ( dll )
                        {
-                               fprintf ( OUT,
"\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false) ==
"" ? "DllMain" : module.GetEntryPoint(false).c_str ());
+                               if (module.GetEntryPoint(false) == "0")
+                                       fprintf ( OUT,
"\t\t\t\tEntryPointSymbol=\"\"\r\n" );
+                               else
+                                       fprintf ( OUT,
"\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n", module.GetEntryPoint(false)
== "" ? "" : "_", module.GetEntryPoint(false) ==
"" ? "_DllMainCRTStartup@12" : module.GetEntryPoint(false).c_str ());
                                fprintf ( OUT,
"\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ?
"0x40000" : baseaddr.c_str ());
                        }
                        fprintf ( OUT,
"\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 );