diff --git a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp index 73502e8fdb5..9648bc421e8 100644 --- a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp +++ b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp @@ -211,7 +211,7 @@ std::string CBBackend::CbpFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.cbp" ) + ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.cbp" ) ); } @@ -219,7 +219,7 @@ std::string CBBackend::LayoutFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.layout" ) + ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.layout" ) ); } @@ -227,7 +227,7 @@ std::string CBBackend::DependFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.depend" ) + ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.depend" ) ); } @@ -236,8 +236,8 @@ CBBackend::_get_object_files ( const Module& module, vector& out) const { string basepath = module.output->relative_path; size_t i; - string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\"; - string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\"; + string intenv = Environment::GetIntermediatePath () + sSep + basepath + sSep; + string outenv = Environment::GetOutputPath () + sSep + basepath + sSep; vector cfgs; @@ -265,7 +265,7 @@ CBBackend::_get_object_files ( const Module& module, vector& out) const for ( i = 0; i < files.size (); i++ ) { string file = files[i]->file.relative_path + sSep + files[i]->file.name; - string::size_type pos = file.find_last_of ("\\"); + string::size_type pos = file.find_last_of (sSep); if ( pos != string::npos ) file.erase ( 0, pos+1 ); if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) @@ -273,7 +273,7 @@ CBBackend::_get_object_files ( const Module& module, vector& out) const else file = ReplaceExtension ( file, ".obj" ); for ( size_t j = 0; j < cfgs.size () / 2; j++ ) - out.push_back ( cfgs[j] + "\\" + file ); + out.push_back ( cfgs[j] + sSep + file ); } } @@ -334,7 +334,7 @@ CBBackend::_generate_workspace ( FILE* OUT ) ifs_list.pop_back(); const vector& libs = data.libraries; for ( size_t j = 0; j < libs.size(); j++ ) - fprintf ( OUT, "\t\t\t\r\n", libs[j]->importedModule->output->relative_path.c_str(), libs[j]->name.c_str() ); + fprintf ( OUT, "\t\t\t\r\n", libs[j]->importedModule->output->relative_path.c_str(), sSep.c_str(), libs[j]->name.c_str() ); } fprintf ( OUT, "\t\t\r\n" ); } @@ -447,7 +447,7 @@ CBBackend::_generate_cbproj ( const Module& module ) const vector& libs = data.libraries; for ( i = 0; i < libs.size(); i++ ) { - string libpath = intdir + "\\" + libs[i]->importedModule->output->relative_path; + string libpath = intdir + sSep + libs[i]->importedModule->output->relative_path; libraries.push_back ( libs[i]->name ); libpaths.push_back ( libpath ); } @@ -516,18 +516,18 @@ CBBackend::_generate_cbproj ( const Module& module ) if ( configuration.UseConfigurationInPath ) { if ( IsStaticLibrary ( module ) ||module.type == ObjectLibrary ) - fprintf ( OUT, "\t\t\t\t