Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 03:46:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove usewrc attribute in rbuild files ; wrc should be able to compile all resources

Browse source 
svn path=/trunk/; revision=29377
This commit is contained in:
Hervé Poussineau 2007-10-03 14:09:45 +00:00
parent 5c98cc37b5
commit 09ab02f6da
5 changed files with 32 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/Makefile
View file

@ -298,7 +298,6 @@ ar = $(Q)$(PREFIX_)ar
objcopy = $(Q)$(PREFIX_)objcopy objcopy = $(Q)$(PREFIX_)objcopy
dlltool = $(Q)$(PREFIX_)dlltool dlltool = $(Q)$(PREFIX_)dlltool
strip = $(Q)$(PREFIX_)strip strip = $(Q)$(PREFIX_)strip
windres = $(Q)$(PREFIX_)windres
# Set utilities # Set utilities
ifeq ($(OSTYPE),msys) ifeq ($(OSTYPE),msys)

80
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -1095,55 +1095,39 @@ MingwModuleHandler::GenerateWindresCommand (
const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files );
if ( module.useWRC ) string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" );
{ FileLocation rciFilename ( TemporaryDirectory,
string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" ); "",
FileLocation rciFilename ( TemporaryDirectory, sourceFilenamePart + ".rci.tmp" );
"", FileLocation resFilename ( TemporaryDirectory,
sourceFilenamePart + ".rci.tmp" ); "",
FileLocation resFilename ( TemporaryDirectory, sourceFilenamePart + ".res.tmp" );
"",
sourceFilenamePart + ".res.tmp" );
fprintf ( fMakefile, fprintf ( fMakefile,
"%s: %s $(WRC_TARGET) | %s\n", "%s: %s $(WRC_TARGET) | %s\n",
backend->GetFullName ( *objectFilename ).c_str (), backend->GetFullName ( *objectFilename ).c_str (),
dependencies.c_str (), dependencies.c_str (),
backend->GetFullPath ( *objectFilename ).c_str () ); backend->GetFullPath ( *objectFilename ).c_str () );
fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n",
windresflagsMacro.c_str (), windresflagsMacro.c_str (),
backend->GetFullName ( *sourceFile ).c_str (), backend->GetFullName ( *sourceFile ).c_str (),
backend->GetFullName ( rciFilename ).c_str () ); backend->GetFullName ( rciFilename ).c_str () );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n",
windresflagsMacro.c_str (), windresflagsMacro.c_str (),
backend->GetFullName ( rciFilename ).c_str (), backend->GetFullName ( rciFilename ).c_str (),
backend->GetFullName ( resFilename ).c_str () ); backend->GetFullName ( resFilename ).c_str () );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t-@${rm} %s 2>$(NUL)\n", "\t-@${rm} %s 2>$(NUL)\n",
backend->GetFullName ( rciFilename ).c_str () ); backend->GetFullName ( rciFilename ).c_str () );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t${windres} %s -o $@\n", "\t${windres} %s -o $@\n",
backend->GetFullName ( resFilename ).c_str () ); backend->GetFullName ( resFilename ).c_str () );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t-@${rm} %s 2>$(NUL)\n", "\t-@${rm} %s 2>$(NUL)\n",
backend->GetFullName ( resFilename ).c_str () ); backend->GetFullName ( resFilename ).c_str () );
}
else
{
fprintf ( fMakefile,
"%s: %s $(WRC_TARGET) | %s\n",
backend->GetFullName ( *objectFilename ).c_str (),
dependencies.c_str (),
backend->GetFullPath ( *objectFilename ).c_str () );
fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );
fprintf ( fMakefile,
"\t${windres} $(%s) %s -o $@\n",
windresflagsMacro.c_str (),
backend->GetFullName ( *sourceFile ).c_str () );
}
} }
void void

6
reactos/tools/rbuild/module.cpp
View file

@ -415,12 +415,6 @@ Module::Module ( const Project& project,
else else
install = NULL; install = NULL;
att = moduleNode.GetAttribute ( "usewrc", false );
if ( att != NULL )
useWRC = att->value == "true";
else
useWRC = true;
att = moduleNode.GetAttribute ( "allowwarnings", false ); att = moduleNode.GetAttribute ( "allowwarnings", false );
if ( att == NULL ) if ( att == NULL )
{ {

1
reactos/tools/rbuild/project.dtd
View file

@ -123,7 +123,6 @@
underscoresymbols (true|yes|false|no) "no" underscoresymbols (true|yes|false|no) "no"
installbase %Text; #IMPLIED installbase %Text; #IMPLIED
installname %Text; #IMPLIED installname %Text; #IMPLIED
usewrc %Text; #IMPLIED
allowwarnings (true|false) "false" allowwarnings (true|false) "false"
aliasof %Text; #IMPLIED aliasof %Text; #IMPLIED
unicode (true|yes|false|no) "no" unicode (true|yes|false|no) "no"

1
reactos/tools/rbuild/rbuild.h
View file

@ -355,7 +355,6 @@ public:
std::string prefix; std::string prefix;
HostType host; HostType host;
std::string aliasedModuleName; std::string aliasedModuleName;
bool useWRC;
bool allowWarnings; bool allowWarnings;
bool enabled; bool enabled;
bool isStartupLib; bool isStartupLib;