Author: cwittich
Date: Sat Jul 8 20:44:38 2006
New Revision: 22923
URL:
http://svn.reactos.org/svn/reactos?rev=22923&view=rev
Log:
-revert 22909
-take care of ModuleDefinitionFile
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 Sat Jul 8 20:44:38 2006
@@ -323,12 +323,7 @@
fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n",
speed ? "FALSE" : "TRUE" );
fprintf ( OUT,
"\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ?
"3" : "0") );
-
- if (dll)
- fprintf ( OUT,
"\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 3 : 2 ); // 3=/MDd
5=/MD
- else
- fprintf ( OUT,
"\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 1 : 5 ); // 1=/MTd
5=/MT
-
+ fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n",
debug ? 1 : 5 ); // 1=/MTd 5=/MT
fprintf ( OUT,
"\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", sys ? "FALSE" :
(debug ? "TRUE" : "FALSE" ));
fprintf ( OUT,
"\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ?
"TRUE" : "FALSE" );
@@ -376,7 +371,8 @@
{
fprintf ( OUT, "\t\t\t<Tool\r\n" );
fprintf ( OUT,
"\t\t\t\tName=\"VCLinkerTool\"\r\n" );
-
+ if (module.importLibrary != NULL)
+ fprintf ( OUT,
"\t\t\t\tModuleDefinitionFile=\"%s\"\r\n",
module.importLibrary->definition.c_str());
fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\""
);
for ( i = 0; i < libraries.size(); i++ )
{