mirror of
https://github.com/reactos/reactos.git
synced 2024-07-23 20:58:16 +00:00
Remove usewrc attribute in rbuild files ; wrc should be able to compile all resources
svn path=/trunk/; revision=29377
This commit is contained in:
parent
5c98cc37b5
commit
09ab02f6da
|
@ -298,7 +298,6 @@ ar = $(Q)$(PREFIX_)ar
|
|||
objcopy = $(Q)$(PREFIX_)objcopy
|
||||
dlltool = $(Q)$(PREFIX_)dlltool
|
||||
strip = $(Q)$(PREFIX_)strip
|
||||
windres = $(Q)$(PREFIX_)windres
|
||||
|
||||
# Set utilities
|
||||
ifeq ($(OSTYPE),msys)
|
||||
|
|
|
@ -1095,55 +1095,39 @@ MingwModuleHandler::GenerateWindresCommand (
|
|||
|
||||
const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files );
|
||||
|
||||
if ( module.useWRC )
|
||||
{
|
||||
string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" );
|
||||
FileLocation rciFilename ( TemporaryDirectory,
|
||||
"",
|
||||
sourceFilenamePart + ".rci.tmp" );
|
||||
FileLocation resFilename ( TemporaryDirectory,
|
||||
"",
|
||||
sourceFilenamePart + ".res.tmp" );
|
||||
string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" );
|
||||
FileLocation rciFilename ( TemporaryDirectory,
|
||||
"",
|
||||
sourceFilenamePart + ".rci.tmp" );
|
||||
FileLocation resFilename ( TemporaryDirectory,
|
||||
"",
|
||||
sourceFilenamePart + ".res.tmp" );
|
||||
|
||||
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${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n",
|
||||
windresflagsMacro.c_str (),
|
||||
backend->GetFullName ( *sourceFile ).c_str (),
|
||||
backend->GetFullName ( rciFilename ).c_str () );
|
||||
fprintf ( fMakefile,
|
||||
"\t$(Q)$(WRC_TARGET) ${%s} %s %s\n",
|
||||
windresflagsMacro.c_str (),
|
||||
backend->GetFullName ( rciFilename ).c_str (),
|
||||
backend->GetFullName ( resFilename ).c_str () );
|
||||
fprintf ( fMakefile,
|
||||
"\t-@${rm} %s 2>$(NUL)\n",
|
||||
backend->GetFullName ( rciFilename ).c_str () );
|
||||
fprintf ( fMakefile,
|
||||
"\t${windres} %s -o $@\n",
|
||||
backend->GetFullName ( resFilename ).c_str () );
|
||||
fprintf ( fMakefile,
|
||||
"\t-@${rm} %s 2>$(NUL)\n",
|
||||
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 () );
|
||||
}
|
||||
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${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n",
|
||||
windresflagsMacro.c_str (),
|
||||
backend->GetFullName ( *sourceFile ).c_str (),
|
||||
backend->GetFullName ( rciFilename ).c_str () );
|
||||
fprintf ( fMakefile,
|
||||
"\t$(Q)$(WRC_TARGET) ${%s} %s %s\n",
|
||||
windresflagsMacro.c_str (),
|
||||
backend->GetFullName ( rciFilename ).c_str (),
|
||||
backend->GetFullName ( resFilename ).c_str () );
|
||||
fprintf ( fMakefile,
|
||||
"\t-@${rm} %s 2>$(NUL)\n",
|
||||
backend->GetFullName ( rciFilename ).c_str () );
|
||||
fprintf ( fMakefile,
|
||||
"\t${windres} %s -o $@\n",
|
||||
backend->GetFullName ( resFilename ).c_str () );
|
||||
fprintf ( fMakefile,
|
||||
"\t-@${rm} %s 2>$(NUL)\n",
|
||||
backend->GetFullName ( resFilename ).c_str () );
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -415,12 +415,6 @@ Module::Module ( const Project& project,
|
|||
else
|
||||
install = NULL;
|
||||
|
||||
att = moduleNode.GetAttribute ( "usewrc", false );
|
||||
if ( att != NULL )
|
||||
useWRC = att->value == "true";
|
||||
else
|
||||
useWRC = true;
|
||||
|
||||
att = moduleNode.GetAttribute ( "allowwarnings", false );
|
||||
if ( att == NULL )
|
||||
{
|
||||
|
|
|
@ -123,7 +123,6 @@
|
|||
underscoresymbols (true|yes|false|no) "no"
|
||||
installbase %Text; #IMPLIED
|
||||
installname %Text; #IMPLIED
|
||||
usewrc %Text; #IMPLIED
|
||||
allowwarnings (true|false) "false"
|
||||
aliasof %Text; #IMPLIED
|
||||
unicode (true|yes|false|no) "no"
|
||||
|
|
|
@ -355,7 +355,6 @@ public:
|
|||
std::string prefix;
|
||||
HostType host;
|
||||
std::string aliasedModuleName;
|
||||
bool useWRC;
|
||||
bool allowWarnings;
|
||||
bool enabled;
|
||||
bool isStartupLib;
|
||||
|
|
Loading…
Reference in a new issue