Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix msvc build bug with project having assemblers

Browse source 
svn path=/trunk/; revision=21858
This commit is contained in:
Johannes Anderwald 2006-05-08 20:13:29 +00:00
parent bef295c91c
commit 1991163828
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/tools/rbuild/backend/msvc/msvc.cpp
View file

@ -344,7 +344,6 @@ MSVCBackend::_get_object_files ( const Module& module, vector<string>& out) cons
out.push_back ( cfgs[i] + "\\" + module.name + ".lib" ); out.push_back ( cfgs[i] + "\\" + module.name + ".lib" );
out.push_back ( cfgs[i] + "\\" + module.name + ".exp" ); out.push_back ( cfgs[i] + "\\" + module.name + ".exp" );
out.push_back ( cfgs[i] + "\\" + module.name + ".ilk" ); out.push_back ( cfgs[i] + "\\" + module.name + ".ilk" );
out.push_back ( cfgs[i] + "\\" + "(InputName).obj" ); //MSVC2003 build bug
} }
} }

6
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
View file

@ -517,13 +517,13 @@ MSVCBackend::_generate_vcproj ( const Module& module )
if (source_file.find(".idl") != string::npos) 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\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')) 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\tName=\"VCCustomBuildTool\"\r\n" );
fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E &quot;$(InputPath)&quot; %s /D__ASM__ | as -o &quot;$(OutDir)\\(InputName).obj&quot;\"\r\n",include_string.c_str() ); fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E &quot;$(InputPath)&quot; %s /D__ASM__ | as -o &quot;$(OutDir)\\$(InputName).obj&quot;\"\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\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" );
} }
fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );
} }