mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 05:37:44 +00:00
Update msvc backend, so Colin Finck will maybe stop complaining...
svn path=/trunk/; revision=29602
This commit is contained in:
parent
3d34c28eb4
commit
813884ad94
|
@ -29,7 +29,6 @@
|
|||
#include <vector>
|
||||
|
||||
#include "msvc.h"
|
||||
#include "../mingw/mingw.h"
|
||||
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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" );
|
||||
|
|
Loading…
Reference in a new issue