Author: gedmurphy
Date: Wed Jul 4 19:28:56 2007
New Revision: 27389
URL:
http://svn.reactos.org/svn/reactos?rev=27389&view=rev
Log:
change the name of the VS config from * - Wine headers to * - ReactOS headers
Modified:
trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
trunk/reactos/tools/rbuild/backend/msvc/msvc.h
trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Wed Jul 4 19:28:56 2007
@@ -73,9 +73,9 @@
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 ) {
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/msvc.h (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h Wed Jul 4 19:28:56 2007
@@ -42,7 +42,7 @@
enum HeadersType
{
MSVCHeaders,
- WineHeaders
+ ReactOSHeaders
};
class MSVCConfiguration
Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Wed Jul 4 19:28:56 2007
@@ -53,7 +53,7 @@
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 @@
bool include_idl = false;
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;
vector<const IfableData*> ifs_list;
ifs_list.push_back ( &module.project.non_if_data );
@@ -179,7 +179,7 @@
!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 @@
fprintf ( OUT, "%s\\include\\reactos\\idl\r\n", intdir.c_str () );
}
}
- if ( cfg.headers == WineHeaders )
- {
- for ( i = 0; i < includes_wine.size(); i++ )
- {
- const std::string& include = includes_wine[i];
+ if ( cfg.headers == ReactOSHeaders )
+ {
+ for ( i = 0; i < includes_ros.size(); i++ )
+ {
+ const std::string& include = includes_ros[i];
if ( multiple_includes )
fprintf ( OUT, ";" );
fprintf ( OUT, "%s", include.c_str() );
@@ -534,11 +534,11 @@
multiple_includes = true;
}
}
- if ( cfg.headers == WineHeaders )
- {
- for ( i = 0; i < includes_wine.size(); i++ )
- {
- const std::string& include = includes_wine[i];
+ if ( cfg.headers == ReactOSHeaders )
+ {
+ for ( i = 0; i < includes_ros.size(); i++ )
+ {
+ const std::string& include = includes_ros[i];
if ( multiple_includes )
fprintf ( OUT, ";" );
fprintf ( OUT, "%s", include.c_str() );