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

Update msvc backend, so Colin Finck will maybe stop complaining...

Browse source 
svn path=/trunk/; revision=29602
This commit is contained in:
Hervé Poussineau 2007-10-15 13:43:51 +00:00
parent 3d34c28eb4
commit 813884ad94
3 changed files with 12 additions and 21 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

@ -29,7 +29,6 @@
#include <vector>
#include "msvc.h"
#include "../mingw/mingw.h"
using std::string;
using std::vector;

9
reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
View file

@ -121,15 +121,6 @@ MSVCBackend::_generate_dsp ( const Module& module )
const vector<Include*>& incs = data.includes;
for ( i = 0; i < incs.size(); i++ )
{
// explicitly omit win32api directories
if ( !strncmp(incs[i]->directory->relative_path.c_str(), "w32api", 6 ) )
continue;
// explicitly omit include/wine directories
if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\wine", 12 ) )
continue;
string path = Path::RelativeFromDirectory (
incs[i]->directory->relative_path,
module.output->relative_path );

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

@ -187,15 +187,16 @@ MSVCBackend::_generate_vcproj ( const Module& module )
continue;
}
}
// add to another list win32api and include/wine directories
if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) ||
!strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ) ||
// switch between general headers and ros headers
if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ) ||
!strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) ||
!strncmp(incs[i]->directory->relative_path.c_str(), "include\\GL", 10 ) ||
!strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) ||
!strncmp(incs[i]->directory->relative_path.c_str(), "include\\psdk", 12 ) ||
!strncmp(incs[i]->directory->relative_path.c_str(), "include\\psdk", 12 ) ||
!strncmp(incs[i]->directory->relative_path.c_str(), "include\\reactos\\wine", 20 ) )
{
includes_ros.push_back ( path );
if (strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ))
// not crt include
includes_ros.push_back ( path );
}
else
{
@ -226,11 +227,11 @@ MSVCBackend::_generate_vcproj ( const Module& module )
baseaddr = prop.value;
}
}
/* include intermediate path for reactos.rc */
string version = intdir + "\\include\\reactos";
includes.push_back (version);
string include_string;
/* include intermediate path for reactos.rc */
string version = intdir + "\\include\\reactos";
includes.push_back (version);
string include_string;
fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" );
fprintf ( OUT, "<VisualStudioProject\r\n" );