diff --git a/reactos/Makefile b/reactos/Makefile index 1e7cbd2fcbf..07148d023ad 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -472,11 +472,6 @@ rgenstat: $(RGENSTAT_TARGET) $(ECHO_RGENSTAT) $(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml -.PHONY: cb -cb: $(ROS_BUILDENGINE) - $(ECHO_RBUILD) - $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb - .PHONY: msbuild msbuild: $(ROS_BUILDENGINE) $(ECHO_RBUILD) diff --git a/reactos/dll/win32/advapi32/reg/reg.c b/reactos/dll/win32/advapi32/reg/reg.c index e131cf2e43b..26036dc1963 100644 --- a/reactos/dll/win32/advapi32/reg/reg.c +++ b/reactos/dll/win32/advapi32/reg/reg.c @@ -4841,15 +4841,7 @@ RegSetValueExW(HKEY hKey, return RtlNtStatusToDosError(Status); } - if (lpValueName != NULL) - { - RtlInitUnicodeString(&ValueName, - lpValueName); - } - else - { - RtlInitUnicodeString(&ValueName, L""); - } + RtlInitUnicodeString(&ValueName, lpValueName); pValueName = &ValueName; if (is_string(dwType) && (cbData != 0)) diff --git a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp deleted file mode 100644 index b1fb3f1c406..00000000000 --- a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp +++ /dev/null @@ -1,908 +0,0 @@ -/* - * Copyright (C) 2006 Christoph von Wittich - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) -#endif//_MSC_VER - -#include -#include -#include -#include - -#include - -#include "codeblocks.h" -#include "../mingw/mingw.h" - -using std::string; -using std::vector; -using std::ifstream; - -#ifdef OUT -#undef OUT -#endif//OUT - -#define IsStaticLibrary( module ) ( ( module.type == StaticLibrary ) || ( module.type == HostStaticLibrary ) ) - -static class CBFactory : public Backend::Factory -{ - public: - - CBFactory() : Factory("CB", "Code::Blocks") {} - Backend *operator() (Project &project, - Configuration& configuration) - { - return new CBBackend(project, configuration); - } - -} factory; - - -CBBackend::CBBackend(Project &project, - Configuration& configuration) : Backend(project, configuration) -{ - m_unitCount = 0; -} - -void CBBackend::Process() -{ - - while ( m_configurations.size () > 0 ) - { - const CBConfiguration* cfg = m_configurations.back(); - m_configurations.pop_back(); - delete cfg; - } - - m_configurations.push_back ( new CBConfiguration( Debug )); - m_configurations.push_back ( new CBConfiguration( Release )); - - string filename_wrkspace ( ProjectNode.name ); - filename_wrkspace += "_auto.workspace"; - - printf ( "Creating Code::Blocks workspace: %s\n", filename_wrkspace.c_str() ); - - ProcessModules(); - m_wrkspaceFile = fopen ( filename_wrkspace.c_str(), "wb" ); - - if ( !m_wrkspaceFile ) - { - printf ( "Could not create file '%s'.\n", filename_wrkspace.c_str() ); - return; - } - - _generate_workspace ( m_wrkspaceFile ); - - fclose ( m_wrkspaceFile ); - printf ( "Done.\n" ); -} - -void CBBackend::ProcessModules() -{ - for( std::map::const_iterator p = ProjectNode.modules.begin(); p != ProjectNode.modules.end(); ++ p ) - { - Module &module = *p->second; - MingwAddImplicitLibraries( module ); - _generate_cbproj ( module ); - } -} - -static std::string -GetExtension ( const std::string& filename ) -{ - size_t index = filename.find_last_of ( '/' ); - if (index == string::npos) index = 0; - string tmp = filename.substr( index, filename.size() - index ); - size_t ext_index = tmp.find_last_of( '.' ); - if (ext_index != string::npos) - return filename.substr ( index + ext_index, filename.size() ); - return ""; -} - -static bool FileExists(string &filename) -{ - ifstream file(filename.c_str()); - - if(!file.is_open()) - return false; - - file.close(); - return true; -} - -void CBBackend::ProcessFile(string &filepath) -{ - // Remove the .\ at the start of the filenames - if ( filepath[0] == '.' && strchr ( "/\\", filepath[1] ) ) - filepath.erase(0, 2); - - if(!FileExists(filepath)) - return; - - // Change the \ to / - for(size_t i = 0; i < filepath.length(); i++) - { - if(filepath[i] == '\\') - filepath[i] = '/'; - } - - // Remove the filename from the path - string folder = ""; - - size_t pos = filepath.rfind(string("/"), filepath.length() - 1); - - if(pos != string::npos) - { - folder = filepath; - folder.erase(pos, folder.length() - pos); - } - - FileUnit fileUnit; - fileUnit.filename = filepath; - fileUnit.folder = folder; - - m_fileUnits.push_back(fileUnit); - - if(folder != "") - AddFolders(folder); - - m_unitCount++; -} - -bool CBBackend::CheckFolderAdded(string &folder) -{ - for(size_t i = 0; i < m_folders.size(); i++) - { - if(m_folders[i] == folder) - return true; - } - - return false; -} - -void CBBackend::AddFolders(string &folder) -{ - // Check if this folder was already added. true if it was, false otherwise. - if(CheckFolderAdded(folder)) - return; - - m_folders.push_back(folder); - - size_t pos = folder.rfind(string("/"), folder.length() - 1); - - if(pos == string::npos) - return; - - folder.erase(pos, folder.length() - pos); - AddFolders(folder); -} - -void CBBackend::OutputFolders() -{ -#if 0 - m_devFile << "Folders="; - - for(size_t i = 0; i < m_folders.size(); i++) - { - if(i > 0) - m_devFile << ","; - - m_devFile << m_folders[i]; - } -#endif -} - -std::string -CBBackend::CbpFileName ( const Module& module ) const -{ - return DosSeparator( - ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.cbp" ) - ); -} - -std::string -CBBackend::LayoutFileName ( const Module& module ) const -{ - return DosSeparator( - ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.layout" ) - ); -} - -std::string -CBBackend::DependFileName ( const Module& module ) const -{ - return DosSeparator( - ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.depend" ) - ); -} - -void -CBBackend::_get_object_files ( const Module& module, vector& out) const -{ - string basepath = module.output->relative_path; - size_t i; - string intenv = Environment::GetIntermediatePath () + sSep + basepath + sSep; - string outenv = Environment::GetOutputPath () + sSep + basepath + sSep; - - vector cfgs; - - if ( configuration.UseConfigurationInPath ) - { - cfgs.push_back ( intenv + "Debug" ); - cfgs.push_back ( intenv + "Release" ); - cfgs.push_back ( outenv + "Debug" ); - cfgs.push_back ( outenv + "Release" ); - } - else - { - cfgs.push_back ( intenv ); - cfgs.push_back ( outenv ); - } - - vector ifs_list; - ifs_list.push_back ( &module.project.non_if_data ); - ifs_list.push_back ( &module.non_if_data ); - while ( ifs_list.size () ) - { - const IfableData& data = *ifs_list.back(); - ifs_list.pop_back(); - const vector& files = data.files; - 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 (sSep); - if ( pos != string::npos ) - file.erase ( 0, pos+1 ); - if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) - file = ReplaceExtension ( file, ".res" ); - else - file = ReplaceExtension ( file, ".obj" ); - for ( size_t j = 0; j < cfgs.size () / 2; j++ ) - out.push_back ( cfgs[j] + sSep + file ); - } - - } -} - -void -CBBackend::_clean_project_files ( void ) -{ - for( std::map::const_iterator p = ProjectNode.modules.begin(); p != ProjectNode.modules.end(); ++ p ) - { - Module& module = *p->second; - vector out; - printf("Cleaning project %s %s\n", module.name.c_str (), module.output->relative_path.c_str () ); - - string basepath = module.output->relative_path; - remove ( CbpFileName ( module ).c_str () ); - remove ( DependFileName ( module ).c_str () ); - remove ( LayoutFileName ( module ).c_str () ); - - _get_object_files ( module, out ); - for ( size_t j = 0; j < out.size (); j++) - { - //printf("Cleaning file %s\n", out[j].c_str () ); - remove ( out[j].c_str () ); - } - } - - string filename_wrkspace = ProjectNode.name + ".workspace"; - - remove ( filename_wrkspace.c_str () ); -} - -void -CBBackend::_generate_workspace ( FILE* OUT ) -{ - fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "\t\r\n" ); - for( std::map::const_iterator p = ProjectNode.modules.begin(); p != ProjectNode.modules.end(); ++ p ) - { - Module& module = *p->second; - - if ((module.type != Iso) && - (module.type != LiveIso)) - { - std::string Cbp_file = CbpFileName ( module ); - fprintf ( OUT, "\t\t\r\n", Cbp_file.c_str()); - - /* dependencies */ - vector ifs_list; - ifs_list.push_back ( &module.project.non_if_data ); - ifs_list.push_back ( &module.non_if_data ); - while ( ifs_list.size() ) - { - const IfableData& data = *ifs_list.back(); - 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(), sSep.c_str(), libs[j]->name.c_str() ); - } - fprintf ( OUT, "\t\t\r\n" ); - } - } - fprintf ( OUT, "\t\r\n" ); - fprintf ( OUT, "\r\n" ); -} - -void -CBBackend::_generate_cbproj ( const Module& module ) -{ - - size_t i; - - string cbproj_file = CbpFileName(module); - string outdir; - string intdir; - string path_basedir = module.GetPathToBaseDir (); - string intenv = Environment::GetIntermediatePath (); - string outenv = Environment::GetOutputPath (); - string module_type = GetExtension(*module.output); - string cbproj_path = module.output->relative_path; - string CompilerVar; - string baseaddr; - string windres_defines; - string widl_options; - string project_linker_flags = "-Wl,--enable-stdcall-fixup "; - project_linker_flags += GenerateProjectLinkerFlags(); - - bool lib = (module.type == ObjectLibrary) || - (module.type == RpcClient) || - (module.type == RpcServer) || - (module.type == RpcProxy) || - (module_type == ".lib") || - (module_type == ".a"); - bool dll = (module_type == ".dll") || (module_type == ".cpl"); - bool exe = (module_type == ".exe") || (module_type == ".scr"); - bool sys = (module_type == ".sys"); - - vector source_files, resource_files, includes, libraries, libpaths; - vector header_files, common_defines, compiler_flags; - vector vars, values; - - /* do not create project files for these targets - use virtual targets instead */ - switch (module.type) - { - case Iso: - case LiveIso: - return; - default: - break; - } - - compiler_flags.push_back ( "-Wall" ); - - // Always force disabling of sibling calls optimisation for GCC - // (TODO: Move to version-specific once this bug is fixed in GCC) - compiler_flags.push_back ( "-fno-optimize-sibling-calls" ); - - if ( module.pch != NULL ) - { - string pch_path = Path::RelativeFromDirectory ( - module.pch->file->name, - module.output->relative_path ); - - header_files.push_back ( pch_path ); - } - - if ( intenv == "obj-i386" ) - intdir = path_basedir + "obj-i386"; /* append relative dir from project dir */ - else - intdir = intenv; - - if ( outenv == "output-i386" ) - outdir = path_basedir + "output-i386"; - else - outdir = outenv; - - vector ifs_list; - ifs_list.push_back ( &module.project.non_if_data ); - ifs_list.push_back ( &module.non_if_data ); - while ( ifs_list.size() ) - { - const IfableData& data = *ifs_list.back(); - ifs_list.pop_back(); - const vector& files = data.files; - for ( i = 0; i < files.size(); i++ ) - { - string fullpath = files[i]->file.relative_path + sSep + files[i]->file.name; - string file = string(".") + &fullpath[cbproj_path.size()]; - - if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) - resource_files.push_back ( file ); - else - source_files.push_back ( file ); - } - const vector& incs = data.includes; - for ( i = 0; i < incs.size(); i++ ) - { - string path = Path::RelativeFromDirectory ( - incs[i]->directory->relative_path, - module.output->relative_path ); - - includes.push_back ( path ); - widl_options += "-I" + path + " "; - } - const vector& libs = data.libraries; - for ( i = 0; i < libs.size(); i++ ) - { - string libpath = intdir + sSep + libs[i]->importedModule->output->relative_path; - libraries.push_back ( libs[i]->name ); - libpaths.push_back ( libpath ); - } - const vector& cflags = data.compilerFlags; - for ( i = 0; i < cflags.size(); i++ ) - { - compiler_flags.push_back ( cflags[i]->flag ); - } - const vector& defs = data.defines; - for ( i = 0; i < defs.size(); i++ ) - { - if ( defs[i]->value[0] ) - { - const string& escaped = _replace_str(defs[i]->value, "\"","""); - common_defines.push_back( defs[i]->name + "=" + escaped ); - windres_defines += "-D" + defs[i]->name + "=" + escaped + " "; - } - else - { - common_defines.push_back( defs[i]->name ); - windres_defines += "-D" + defs[i]->name + " "; - } - } - /*const vector& variables = data.properties; - for ( i = 0; i < variables.size(); i++ ) - { - vars.push_back( variables[i]->name ); - values.push_back( variables[i]->value ); - }*/ - for ( std::map::const_iterator p = data.properties.begin(); p != data.properties.end(); ++ p ) - { - Property& prop = *p->second; - if ( strstr ( module.baseaddress.c_str(), prop.name.c_str() ) ) - baseaddr = prop.value; - } - } - - if ( !module.allowWarnings ) - compiler_flags.push_back ( "-Werror" ); - - if ( IsStaticLibrary ( module ) && module.isStartupLib ) - compiler_flags.push_back ( "-Wno-main" ); - - - FILE* OUT = fopen ( cbproj_file.c_str(), "wb" ); - - fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "\t\r\n" ); - fprintf ( OUT, "\t\r\n" ); - fprintf ( OUT, "\t\t\r\n" ); - fprintf ( OUT, "\r\n" ); - - - fclose ( OUT ); -} - -CBConfiguration::CBConfiguration ( const OptimizationType optimization, const std::string &name ) -{ - this->optimization = optimization; - if ( name != "" ) - this->name = name; - else - { - if ( optimization == Debug ) - this->name = "Debug"; - else if ( optimization == Release ) - this->name = "Release"; - else - this->name = "Unknown"; - } -} - -std::string -CBBackend::_replace_str(std::string string1, const std::string &find_str, const std::string &replace_str) -{ - std::string::size_type pos = string1.find(find_str, 0); - int intLen = find_str.length(); - - while(std::string::npos != pos) - { - string1.replace(pos, intLen, replace_str); - pos = string1.find(find_str, intLen + pos); - } - - return string1; -} - -std::string -CBBackend::GenerateProjectLinkerFlags() const -{ - std::string lflags; - for ( size_t i = 0; i < ProjectNode.linkerFlags.size (); i++ ) - { - LinkerFlag& linkerFlag = *ProjectNode.linkerFlags[i]; - if ( lflags.length () > 0 ) - lflags += " "; - lflags += linkerFlag.flag; - } - return lflags; -} - -void -CBBackend::MingwAddImplicitLibraries( Module &module ) -{ - Library* pLibrary; - - if ( !module.isDefaultEntryPoint ) - return; - - if ( module.IsDLL () ) - { - //pLibrary = new Library ( module, "__mingw_dllmain" ); - //module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin(), pLibrary ); - } - else - { - pLibrary = new Library ( module, module.isUnicode ? "mingw_wmain" : "mingw_main" ); - module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin(), pLibrary ); - } - - pLibrary = new Library ( module, "mingw_common" ); - module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin() + 1, pLibrary ); - - if ( module.name != "msvcrt" ) - { - // always link in msvcrt to get the basic routines - pLibrary = new Library ( module, "msvcrt" ); - module.non_if_data.libraries.push_back ( pLibrary ); - } -} - -const Property* -CBBackend::_lookup_property ( const Module& module, const std::string& name ) const -{ - std::map::const_iterator p; - - /* Check local values */ - p = module.non_if_data.properties.find(name); - - if ( p != module.non_if_data.properties.end() ) - return p->second; - - // TODO FIXME - should we check local if-ed properties? - p = module.project.non_if_data.properties.find(name); - - if ( p != module.project.non_if_data.properties.end() ) - return p->second; - - // TODO FIXME - should we check global if-ed properties? - return NULL; -} - -bool -CBBackend::IsSpecDefinitionFile ( const Module& module ) const -{ - if ( module.importLibrary == NULL) - return false; - - size_t index = module.importLibrary->source->name.rfind ( ".spec" ); - return ( index != string::npos ); -} diff --git a/reactos/tools/rbuild/backend/codeblocks/codeblocks.h b/reactos/tools/rbuild/backend/codeblocks/codeblocks.h deleted file mode 100644 index c0d0c26309b..00000000000 --- a/reactos/tools/rbuild/backend/codeblocks/codeblocks.h +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2005 Trevor McCort - * Copyright (C) 2005 Casper S. Hornstrup - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include -#include -#include - -#include "../backend.h" - -class FileUnit -{ - public: - std::string filename; - std::string folder; -}; - -enum OptimizationType -{ - Debug, - Release -}; - -class CBConfiguration -{ - public: - CBConfiguration(const OptimizationType optimization, - const std::string &name = ""); - virtual ~CBConfiguration() {} - std::string name; - OptimizationType optimization; -}; - -class CBBackend : public Backend -{ - public: - - CBBackend(Project &project, - Configuration& configuration); - virtual ~CBBackend() {} - - virtual void Process(); - - private: - - void ProcessModules(); - void ProcessFile(std::string &filename); - - bool CheckFolderAdded(std::string &folder); - void AddFolders(std::string &folder); - - void OutputFolders(); - void OutputFileUnits(); - - std::string CbpFileName ( const Module& module ) const; - std::string LayoutFileName ( const Module& module ) const; - std::string DependFileName ( const Module& module ) const; - std::string GenerateProjectLinkerFlags () const; - void MingwAddImplicitLibraries( Module &module ); - bool IsSpecDefinitionFile ( const Module& module ) const; - std::vector m_configurations; - - std::vector m_fileUnits; - std::vector m_folders; - - int m_unitCount; - - FILE* m_wrkspaceFile; - - std::string _replace_str( - std::string string1, - const std::string &find_str, - const std::string &replace_str); - - void _generate_workspace ( FILE* OUT ); - void _generate_cbproj ( const Module& module ); - - void _clean_project_files ( void ); - void _get_object_files ( const Module& module, std::vector& out ) const; - void _install_files ( const std::string& vcdir, const std::string& config ); - bool _copy_file ( const std::string& inputname, const std::string& targetname ) const; - const Property* _lookup_property ( const Module& module, const std::string& name ) const; -}; diff --git a/reactos/tools/rbuild/rbuild.mak b/reactos/tools/rbuild/rbuild.mak index 1a3138f7d14..bf328f71fd1 100644 --- a/reactos/tools/rbuild/rbuild.mak +++ b/reactos/tools/rbuild/rbuild.mak @@ -84,24 +84,6 @@ $(RBUILD_TESTS_OUT): | $(RBUILD_OUT) ${mkdir} $@ endif -RBUILD_CODEBLOCKS_BASE = $(RBUILD_BACKEND_BASE_)codeblocks -RBUILD_CODEBLOCKS_BASE_ = $(RBUILD_CODEBLOCKS_BASE)$(SEP) -RBUILD_CODEBLOCKS_INT = $(INTERMEDIATE_)$(RBUILD_CODEBLOCKS_BASE) -RBUILD_CODEBLOCKS_INT_ = $(RBUILD_CODEBLOCKS_INT)$(SEP) -RBUILD_CODEBLOCKS_OUT = $(OUTPUT_)$(RBUILD_CODEBLOCKS_BASE) -RBUILD_CODEBLOCKS_OUT_ = $(RBUILD_CODEBLOCKS_OUT)$(SEP) - -$(RBUILD_CODEBLOCKS_INT): | $(RBUILD_BACKEND_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_CODEBLOCKS_OUT): | $(RBUILD_BACKEND_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - - RBUILD_MSBUILD_BASE = $(RBUILD_BACKEND_BASE_)msbuild RBUILD_MSBUILD_BASE_ = $(RBUILD_MSBUILD_BASE)$(SEP) RBUILD_MSBUILD_INT = $(INTERMEDIATE_)$(RBUILD_MSBUILD_BASE) @@ -186,10 +168,6 @@ RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \ rule.cpp \ ) -RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES = $(addprefix $(RBUILD_CODEBLOCKS_BASE_), \ - codeblocks.cpp \ - ) - RBUILD_BACKEND_DEPMAP_BASE_SOURCES = $(addprefix $(RBUILD_DEPMAP_BASE_), \ dependencymap.cpp \ ) @@ -215,7 +193,6 @@ RBUILD_BACKEND_MSVC_BASE_SOURCES = $(addprefix $(RBUILD_MSVC_BASE_), \ RBUILD_BACKEND_SOURCES = \ $(RBUILD_BACKEND_MINGW_BASE_SOURCES) \ $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ - $(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \ $(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \ $(RBUILD_BACKEND_VREPORT_BASE_SOURCES) \ $(RBUILD_BACKEND_MSBUILD_BASE_SOURCES) \ @@ -257,9 +234,6 @@ RBUILD_OBJECTS = \ RBUILD_BACKEND_MSVCCPP_HEADERS = \ msvc.h -RBUILD_BACKEND_CODEBLOCKS_HEADERS = \ - codeblocks.h - RBUILD_BACKEND_DEPMAP_HEADERS = \ dependencymap.h @@ -278,7 +252,6 @@ RBUILD_BACKEND_HEADERS = \ backend.h \ $(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \ - $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \ $(addprefix msbuild$(SEP), $(RBUILD_BACKEND_MSBUILD_HEADERS)) \ $(addprefix versionreport$(SEP), $(RBUILD_BACKEND_VREPORT_HEADERS)) \ $(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS)) @@ -470,10 +443,6 @@ $(RBUILD_MINGW_INT_)rule.o: $(RBUILD_MINGW_BASE_)rule.cpp $(RBUILD_HEADERS) | $( $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_CODEBLOCKS_INT_)codeblocks.o: $(RBUILD_CODEBLOCKS_BASE_)codeblocks.cpp $(RBUILD_HEADERS) | $(RBUILD_CODEBLOCKS_INT) - $(ECHO_HOSTCC) - ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ - $(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp $(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT) $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ diff --git a/reactos/tools/rbuild/rbuild.vcproj b/reactos/tools/rbuild/rbuild.vcproj index 763850a1804..b85528e6c1f 100644 --- a/reactos/tools/rbuild/rbuild.vcproj +++ b/reactos/tools/rbuild/rbuild.vcproj @@ -443,18 +443,6 @@ > - - - - - -