[ros-diffs] [cwittich] 23001: -get rid of DllMain at 12 because MSVC defaults to_DllMainCRTStartup at 12 when using CRT

[cwittich at svn.reactos.org]

Author: cwittich
Date: Mon Jul 10 22:16:28 2006
New Revision: 23001

URL: http://svn.reactos.org/svn/reactos?rev=23001&view=rev
Log:
-get rid of DllMain at 12 because MSVC defaults to_DllMainCRTStartup at 12 when using CRT

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/vcprojmaker.cpp?rev=23001&r1=23000&r2=23001&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Jul 10 22:16:28 2006
@@ -449,7 +449,14 @@
 				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 at 12" : module.GetEntryPoint(false).c_str ());
+				{	
+					// get rid of DllMain at 12 because MSVC needs to link to _DllMainCRTStartup at 12
+					// when using CRT
+					if (module.GetEntryPoint(false) == "DllMain at 12") 
+						fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" );
+					else
+						fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", 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 );
@@ -486,6 +493,12 @@
 
 		fprintf ( OUT, "\t\t\t<Tool\r\n" );
 		fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" );
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		if (configuration.VSProjectVersion == "8.00")
+		{
+			fprintf ( OUT, "\t\t\t\tName=\"VCManifestTool\"\r\n" );
+			fprintf ( OUT, "\t\t\t\tEmbedManifest=\"false\"/>\r\n" );
+		}
 		fprintf ( OUT, "\t\t\t<Tool\r\n" );
 		fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" );
 		fprintf ( OUT, "\t\t\t<Tool\r\n" );