mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 13:45:58 +00:00
Ignore compiler flags when generating resource macro
svn path=/trunk/; revision=29682
This commit is contained in:
parent
e7d0bd05c2
commit
7e9e19c6f6
|
@ -766,12 +766,16 @@ MingwModuleHandler::GenerateMacro (
|
|||
const char* assignmentOperation,
|
||||
const string& macro,
|
||||
const IfableData& data,
|
||||
set<string> *used_defs )
|
||||
set<string> *used_defs,
|
||||
bool generatingCompilerMacro )
|
||||
{
|
||||
size_t i;
|
||||
bool generateAssignment;
|
||||
|
||||
if ( generatingCompilerMacro )
|
||||
generateAssignment = (use_pch && module.pch != NULL ) || data.includes.size () > 0 || data.defines.size () > 0 || data.compilerFlags.size () > 0;
|
||||
else
|
||||
generateAssignment = (use_pch && module.pch != NULL ) || data.includes.size () > 0 || data.defines.size () > 0;
|
||||
if ( generateAssignment )
|
||||
{
|
||||
fprintf ( fMakefile,
|
||||
|
@ -787,6 +791,8 @@ MingwModuleHandler::GenerateMacro (
|
|||
backend->GetFullPath ( *GetPrecompiledHeaderFilename () ).c_str () );
|
||||
}
|
||||
|
||||
if ( generatingCompilerMacro )
|
||||
{
|
||||
string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags );
|
||||
if ( compilerParameters.size () > 0 )
|
||||
{
|
||||
|
@ -795,7 +801,7 @@ MingwModuleHandler::GenerateMacro (
|
|||
" %s",
|
||||
compilerParameters.c_str () );
|
||||
}
|
||||
|
||||
}
|
||||
for ( i = 0; i < data.includes.size(); i++ )
|
||||
{
|
||||
const Include& include = *data.includes[i];
|
||||
|
@ -845,11 +851,13 @@ MingwModuleHandler::GenerateMacros (
|
|||
GenerateMacro ( assignmentOperation,
|
||||
cflagsMacro,
|
||||
data,
|
||||
&used_defs );
|
||||
&used_defs,
|
||||
true );
|
||||
GenerateMacro ( assignmentOperation,
|
||||
windresflagsMacro,
|
||||
data,
|
||||
NULL );
|
||||
NULL,
|
||||
false );
|
||||
|
||||
if ( linkerFlags != NULL )
|
||||
{
|
||||
|
|
|
@ -137,7 +137,8 @@ private:
|
|||
void GenerateMacro ( const char* assignmentOperation,
|
||||
const std::string& macro,
|
||||
const IfableData& data,
|
||||
std::set<std::string>* used_defs );
|
||||
std::set<std::string>* used_defs,
|
||||
bool generatingCompilerMacro );
|
||||
void GenerateMacros ( const char* op,
|
||||
const IfableData& data,
|
||||
const std::vector<LinkerFlag*>* linkerFlags,
|
||||
|
|
Loading…
Reference in a new issue