mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 13:45:58 +00:00
change the name of the VS config from * - Wine headers to * - ReactOS headers
svn path=/trunk/; revision=27389
This commit is contained in:
parent
2e3fcb5dd9
commit
be2228c407
|
@ -73,9 +73,9 @@ void MSVCBackend::Process()
|
||||||
|
|
||||||
if (!only_msvc_headers)
|
if (!only_msvc_headers)
|
||||||
{
|
{
|
||||||
m_configurations.push_back ( new MSVCConfiguration( Debug, WineHeaders ));
|
m_configurations.push_back ( new MSVCConfiguration( Debug, ReactOSHeaders ));
|
||||||
m_configurations.push_back ( new MSVCConfiguration( Release, WineHeaders ));
|
m_configurations.push_back ( new MSVCConfiguration( Release, ReactOSHeaders ));
|
||||||
m_configurations.push_back ( new MSVCConfiguration( Speed, WineHeaders ));
|
m_configurations.push_back ( new MSVCConfiguration( Speed, ReactOSHeaders ));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( configuration.CleanAsYouGo ) {
|
if ( configuration.CleanAsYouGo ) {
|
||||||
|
|
|
@ -42,7 +42,7 @@ enum OptimizationType
|
||||||
enum HeadersType
|
enum HeadersType
|
||||||
{
|
{
|
||||||
MSVCHeaders,
|
MSVCHeaders,
|
||||||
WineHeaders
|
ReactOSHeaders
|
||||||
};
|
};
|
||||||
|
|
||||||
class MSVCConfiguration
|
class MSVCConfiguration
|
||||||
|
|
|
@ -53,7 +53,7 @@ MSVCConfiguration::MSVCConfiguration ( const OptimizationType optimization, cons
|
||||||
if ( headers == MSVCHeaders )
|
if ( headers == MSVCHeaders )
|
||||||
headers_name = "";
|
headers_name = "";
|
||||||
else
|
else
|
||||||
headers_name = " - Wine headers";
|
headers_name = " - ReactOS headers";
|
||||||
if ( optimization == Debug )
|
if ( optimization == Debug )
|
||||||
this->name = "Debug" + headers_name;
|
this->name = "Debug" + headers_name;
|
||||||
else if ( optimization == Release )
|
else if ( optimization == Release )
|
||||||
|
@ -124,7 +124,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
|
||||||
bool include_idl = false;
|
bool include_idl = false;
|
||||||
|
|
||||||
string vcproj_path = module.GetBasePath();
|
string vcproj_path = module.GetBasePath();
|
||||||
vector<string> source_files, resource_files, includes, includes_wine, libraries;
|
vector<string> source_files, resource_files, includes, includes_ros, libraries;
|
||||||
StringSet common_defines;
|
StringSet common_defines;
|
||||||
vector<const IfableData*> ifs_list;
|
vector<const IfableData*> ifs_list;
|
||||||
ifs_list.push_back ( &module.project.non_if_data );
|
ifs_list.push_back ( &module.project.non_if_data );
|
||||||
|
@ -179,7 +179,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
|
||||||
!strncmp(incs[i]->directory.c_str(), "include\\psdk", 12 ) ||
|
!strncmp(incs[i]->directory.c_str(), "include\\psdk", 12 ) ||
|
||||||
!strncmp(incs[i]->directory.c_str(), "include\\reactos\\wine", 20 ) )
|
!strncmp(incs[i]->directory.c_str(), "include\\reactos\\wine", 20 ) )
|
||||||
{
|
{
|
||||||
includes_wine.push_back ( path );
|
includes_ros.push_back ( path );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -304,11 +304,11 @@ MSVCBackend::_generate_vcproj ( const Module& module )
|
||||||
fprintf ( OUT, "%s\\include\\reactos\\idl\r\n", intdir.c_str () );
|
fprintf ( OUT, "%s\\include\\reactos\\idl\r\n", intdir.c_str () );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( cfg.headers == WineHeaders )
|
if ( cfg.headers == ReactOSHeaders )
|
||||||
{
|
{
|
||||||
for ( i = 0; i < includes_wine.size(); i++ )
|
for ( i = 0; i < includes_ros.size(); i++ )
|
||||||
{
|
{
|
||||||
const std::string& include = includes_wine[i];
|
const std::string& include = includes_ros[i];
|
||||||
if ( multiple_includes )
|
if ( multiple_includes )
|
||||||
fprintf ( OUT, ";" );
|
fprintf ( OUT, ";" );
|
||||||
fprintf ( OUT, "%s", include.c_str() );
|
fprintf ( OUT, "%s", include.c_str() );
|
||||||
|
@ -534,11 +534,11 @@ MSVCBackend::_generate_vcproj ( const Module& module )
|
||||||
multiple_includes = true;
|
multiple_includes = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( cfg.headers == WineHeaders )
|
if ( cfg.headers == ReactOSHeaders )
|
||||||
{
|
{
|
||||||
for ( i = 0; i < includes_wine.size(); i++ )
|
for ( i = 0; i < includes_ros.size(); i++ )
|
||||||
{
|
{
|
||||||
const std::string& include = includes_wine[i];
|
const std::string& include = includes_ros[i];
|
||||||
if ( multiple_includes )
|
if ( multiple_includes )
|
||||||
fprintf ( OUT, ";" );
|
fprintf ( OUT, ";" );
|
||||||
fprintf ( OUT, "%s", include.c_str() );
|
fprintf ( OUT, "%s", include.c_str() );
|
||||||
|
|
Loading…
Reference in a new issue