Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-18 21:13:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't use VCToolsFile anymore because of different include dirs for subprojects

Browse source 
svn path=/trunk/; revision=20690
This commit is contained in:
Christoph von Wittich 2006-01-08 00:48:28 +00:00
parent 4dfc853855
commit e7ac44d731
3 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,19 +54,19 @@ MSVCBackend::MSVCBackend(Project &project,
void MSVCBackend::Process()
{
string filename_sln ( ProjectNode.name );
string filename_rules = "gccasm.rules";
//string filename_rules = "gccasm.rules";
if ( configuration.VSProjectVersion == "6.00" )
filename_sln += ".dsw";
else {
filename_sln += ".sln";
m_rulesFile = fopen ( filename_rules.c_str(), "wb" );
if ( m_rulesFile )
{
_generate_rules_file ( m_rulesFile );
}
fclose ( m_rulesFile );
//m_rulesFile = fopen ( filename_rules.c_str(), "wb" );
//if ( m_rulesFile )
//{
// _generate_rules_file ( m_rulesFile );
//}
//fclose ( m_rulesFile );
}
printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() );

2
reactos/tools/rbuild/backend/msvc/msvc.h
View file

@ -92,7 +92,7 @@ class MSVCBackend : public Backend
void _generate_sln_header ( FILE* OUT );
void _generate_sln_footer ( FILE* OUT );
void _generate_sln ( FILE* OUT );
void _generate_rules_file ( FILE* OUT );
//void _generate_rules_file ( FILE* OUT );
void _generate_sln_project (
FILE* OUT,
const Module& module,

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

@ -493,7 +493,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );
}
if (configuration.VSProjectVersion < "8.00") {
//if (configuration.VSProjectVersion < "8.00") {
if ((source_file.find(".idl") != string::npos) || ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')))
{
fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" );
@ -514,7 +514,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
}
fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" );
}
}
//}
}
fprintf ( OUT, "\t\t\t</File>\r\n" );
}
@ -588,29 +588,29 @@ MSVCBackend::_get_solution_verion ( void ) {
}
void
MSVCBackend::_generate_rules_file ( FILE* OUT )
{
fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" );
fprintf ( OUT, "<VisualStudioToolFile\r\n" );
fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" );
fprintf ( OUT, "\tVersion=\"%s\"\r\n", _get_solution_verion().c_str() );
fprintf ( OUT, "\t>\r\n" );
fprintf ( OUT, "\t<Rules>\r\n" );
fprintf ( OUT, "\t\t<CustomBuildRule\r\n" );
fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" );
fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" );
fprintf ( OUT, "\t\t\tCommandLine=\"cl /E &quot;$(InputPath)&quot; | as -o &quot;$(OutDir)\\$(InputName).obj&quot;\"\r\n" );
fprintf ( OUT, "\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" );
fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" );
fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" );
fprintf ( OUT, "\t\t\t>\r\n" );
fprintf ( OUT, "\t\t\t<Properties>\r\n" );
fprintf ( OUT, "\t\t\t</Properties>\r\n" );
fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" );
fprintf ( OUT, "\t</Rules>\r\n" );
fprintf ( OUT, "</VisualStudioToolFile>\r\n" );
}
//void
//MSVCBackend::_generate_rules_file ( FILE* OUT )
//{
// fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" );
// fprintf ( OUT, "<VisualStudioToolFile\r\n" );
// fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" );
// fprintf ( OUT, "\tVersion=\"%s\"\r\n", _get_solution_verion().c_str() );
// fprintf ( OUT, "\t>\r\n" );
// fprintf ( OUT, "\t<Rules>\r\n" );
// fprintf ( OUT, "\t\t<CustomBuildRule\r\n" );
// fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" );
// fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" );
// fprintf ( OUT, "\t\t\tCommandLine=\"cl /E &quot;$(InputPath)&quot; | as -o &quot;$(OutDir)\\$(InputName).obj&quot;\"\r\n" );
// fprintf ( OUT, "\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" );
// fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" );
// fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" );
// fprintf ( OUT, "\t\t\t>\r\n" );
// fprintf ( OUT, "\t\t\t<Properties>\r\n" );
// fprintf ( OUT, "\t\t\t</Properties>\r\n" );
// fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" );
// fprintf ( OUT, "\t</Rules>\r\n" );
// fprintf ( OUT, "</VisualStudioToolFile>\r\n" );
//}
void
MSVCBackend::_generate_sln_header ( FILE* OUT )