diff --git a/reactos/tools/rbuild/backend/msvc/msvc.cpp b/reactos/tools/rbuild/backend/msvc/msvc.cpp index 13ad8ac3278..d98b51d7aa7 100644 --- a/reactos/tools/rbuild/backend/msvc/msvc.cpp +++ b/reactos/tools/rbuild/backend/msvc/msvc.cpp @@ -73,9 +73,9 @@ void MSVCBackend::Process() if (!only_msvc_headers) { - m_configurations.push_back ( new MSVCConfiguration( Debug, WineHeaders )); - m_configurations.push_back ( new MSVCConfiguration( Release, WineHeaders )); - m_configurations.push_back ( new MSVCConfiguration( Speed, WineHeaders )); + m_configurations.push_back ( new MSVCConfiguration( Debug, ReactOSHeaders )); + m_configurations.push_back ( new MSVCConfiguration( Release, ReactOSHeaders )); + m_configurations.push_back ( new MSVCConfiguration( Speed, ReactOSHeaders )); } if ( configuration.CleanAsYouGo ) { diff --git a/reactos/tools/rbuild/backend/msvc/msvc.h b/reactos/tools/rbuild/backend/msvc/msvc.h index 39ab66b264d..f22390b9257 100644 --- a/reactos/tools/rbuild/backend/msvc/msvc.h +++ b/reactos/tools/rbuild/backend/msvc/msvc.h @@ -42,7 +42,7 @@ enum OptimizationType enum HeadersType { MSVCHeaders, - WineHeaders + ReactOSHeaders }; class MSVCConfiguration diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp index 948669638f4..31b3ec3dd66 100644 --- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp +++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp @@ -53,7 +53,7 @@ MSVCConfiguration::MSVCConfiguration ( const OptimizationType optimization, cons if ( headers == MSVCHeaders ) headers_name = ""; else - headers_name = " - Wine headers"; + headers_name = " - ReactOS headers"; if ( optimization == Debug ) this->name = "Debug" + headers_name; else if ( optimization == Release ) @@ -124,7 +124,7 @@ MSVCBackend::_generate_vcproj ( const Module& module ) bool include_idl = false; string vcproj_path = module.GetBasePath(); - vector source_files, resource_files, includes, includes_wine, libraries; + vector source_files, resource_files, includes, includes_ros, libraries; StringSet common_defines; vector ifs_list; 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\\reactos\\wine", 20 ) ) { - includes_wine.push_back ( path ); + includes_ros.push_back ( path ); } else { @@ -304,11 +304,11 @@ MSVCBackend::_generate_vcproj ( const Module& module ) 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 ) fprintf ( OUT, ";" ); fprintf ( OUT, "%s", include.c_str() ); @@ -534,11 +534,11 @@ MSVCBackend::_generate_vcproj ( const Module& module ) 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 ) fprintf ( OUT, ";" ); fprintf ( OUT, "%s", include.c_str() );