Author: janderwald Date: Tue May 9 00:13:29 2006 New Revision: 21858
URL: http://svn.reactos.ru/svn/reactos?rev=21858&view=rev Log: fix msvc build bug with project having assemblers
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/ms... ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Tue May 9 00:13:29 2006 @@ -344,7 +344,6 @@ out.push_back ( cfgs[i] + "\" + module.name + ".lib" ); out.push_back ( cfgs[i] + "\" + module.name + ".exp" ); out.push_back ( cfgs[i] + "\" + module.name + ".ilk" ); - out.push_back ( cfgs[i] + "\" + "(InputName).obj" ); //MSVC2003 build bug } }
Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/vc... ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Tue May 9 00:13:29 2006 @@ -517,13 +517,13 @@ if (source_file.find(".idl") != string::npos) { fprintf ( OUT, "\t\t\t\t\t\tName="VCCustomBuildTool"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tOutputs="$(OutDir)\(InputName).obj"/>\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs="$(OutDir)\$(InputName).obj"/>\r\n" ); } else if ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) { fprintf ( OUT, "\t\t\t\t\t\tName="VCCustomBuildTool"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tCommandLine="cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\(InputName).obj""\r\n",include_string.c_str() ); - fprintf ( OUT, "\t\t\t\t\t\tOutputs="$(OutDir)\(InputName).obj"/>\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine="cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\$(InputName).obj""\r\n",include_string.c_str() ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs="$(OutDir)\$(InputName).obj"/>\r\n" ); } fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); }