[ros-diffs] [hyperion] 37631: Undoing fishy patch for warnings in Wine code (see r37629)
hyperion at svn.reactos.org
hyperion at svn.reactos.org
Tue Nov 25 15:11:55 CET 2008
Author: hyperion
Date: Tue Nov 25 08:11:55 2008
New Revision: 37631
URL: http://svn.reactos.org/svn/reactos?rev=37631&view=rev
Log:
Undoing fishy patch for warnings in Wine code (see r37629)
Modified:
trunk/reactos/ReactOS-generic.rbuild
trunk/reactos/base/shell/explorer/explorer.rbuild
trunk/reactos/dll/win32/glu32/glu32.rbuild
trunk/reactos/dll/win32/kernel32/kernel32.rbuild
trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
Modified: trunk/reactos/ReactOS-generic.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev=37631&r1=37630&r2=37631&view=diff
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008
@@ -119,5 +119,4 @@
<xi:include href="tools/tools.rbuild" />
</directory>
- <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
</group>
Modified: trunk/reactos/base/shell/explorer/explorer.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explorer.rbuild?rev=37631&r1=37630&r2=37631&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008
@@ -2,6 +2,7 @@
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" unicode="yes">
+ <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
<include base="explorer">.</include>
<define name="WIN32" />
<define name="__WINDRES__" />
Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbuild?rev=37631&r1=37630&r2=37631&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008
@@ -9,6 +9,7 @@
<define name="RESOLVE_3D_TEXTURE_SUPPORT" />
<define name="BUILD_GL32" />
<define name="LIBRARYBUILD" />
+ <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
<library>ntdll</library>
<library>opengl32</library>
<library>kernel32</library>
Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel32.rbuild?rev=37631&r1=37630&r2=37631&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008
@@ -125,6 +125,7 @@
<compilerflag compiler="cpp">-fno-exceptions</compilerflag>
<compilerflag compiler="cpp">-fno-rtti</compilerflag>
+ <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
<directory name="misc">
<file>icustubs.cpp</file>
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild?rev=37631&r1=37630&r2=37631&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008
@@ -7,6 +7,7 @@
<linkerflag>-fno-exceptions</linkerflag>
<linkerflag>-fno-rtti</linkerflag>
-->
+ <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
<importlibrary definition="portcls.spec" />
<define name="_NTDDK_" />
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp?rev=37631&r1=37630&r2=37631&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Nov 25 08:11:55 2008
@@ -392,7 +392,7 @@
if ( data.includes.size () > 0 )
fprintf (
fMakefile,
- "PROJECT_CINCLUDES %s %s\n",
+ "PROJECT_CFLAGS %s %s\n",
assignmentOperation,
MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ).c_str ());
@@ -529,16 +529,15 @@
GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data );
GenerateProjectGccOptions ( "=", ProjectNode.non_if_data );
- fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" );
- fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" );
+ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" );
+ fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" );
fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () );
fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" );
- fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -Wall\n" );
+ fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
- fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" );
+ fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" );
fprintf ( fMakefile, "endif\n" );
- fprintf ( fMakefile, "PROJECT_CFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CFLAGS)\n" );
- fprintf ( fMakefile, "PROJECT_CXXFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CXXFLAGS)\n" );
+ fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" );
fprintf ( fMakefile, "\n" );
}
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=37631&r1=37630&r2=37631&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue Nov 25 08:11:55 2008
@@ -752,7 +752,7 @@
{
fprintf ( fMakefile, "# MACROS\n" );
GenerateMacro ( assignmentOperation,
- commonflagsMacro,
+ cflagsMacro,
data,
&used_defs,
true );
@@ -1118,7 +1118,7 @@
"\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n"
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
"\t$(ECHO_CC)\n"
- "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n",
+ "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o",
@@ -1141,12 +1141,12 @@
Rule gppRule ( "$(source): ${$(module_name)_precondition}\n"
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
"\t$(ECHO_CC)\n"
- "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n",
+ "\t${gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL );
Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n"
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
"\t$(ECHO_CC)\n"
- "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n",
+ "\t${host_gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL );
Rule emptyRule ( "", NULL );
@@ -1658,7 +1658,7 @@
"\t%s -o %s %s %s -g %s\n\n",
module.cplusplus ? cppc.c_str() : cc.c_str(),
backend->GetFullName ( *pchFilename ).c_str(),
- module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(),
+ cflagsMacro.c_str(),
GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(),
backend->GetFullName ( baseHeaderFile ).c_str() );
delete pchFilename;
@@ -1709,6 +1709,13 @@
fprintf ( fMakefile, "\n" );
return archiveFilename;
+}
+
+string
+MingwModuleHandler::GetCFlagsMacro () const
+{
+ return ssprintf ( "$(%s_CFLAGS)",
+ module.name.c_str () );
}
/*static*/ string
@@ -1840,9 +1847,7 @@
fprintf ( fMakefile, "# OTHER MACROS\n" );
- commonflagsMacro = ssprintf ("%s_COMMONFLAGS", module.name.c_str ());
cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ());
- cxxflagsMacro = ssprintf ("%s_CXXFLAGS", module.name.c_str ());
nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ());
windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ());
widlflagsMacro = ssprintf ("%s_WIDLFLAGS", module.name.c_str ());
@@ -1885,10 +1890,10 @@
fprintf ( fMakefile, "\n" );
}
- string globalCflags = " ";
- globalCflags += ssprintf ("$(%s)", commonflagsMacro.c_str ());
+ string globalCflags = "";
if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse )
{
+ globalCflags += " $(PROJECT_CFLAGS)";
if ( module.dynamicCRT )
globalCflags += " -D_DLL -D__USE_CRTIMP";
}
@@ -1921,20 +1926,14 @@
// (TODO: Move to version-specific once this bug is fixed in GCC)
globalCflags += " -fno-optimize-sibling-calls";
+ fprintf (
+ fMakefile,
+ "%s +=%s\n",
+ cflagsMacro.c_str (),
+ globalCflags.c_str () );
+
if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse )
{
- fprintf (
- fMakefile,
- "%s +=%s\n",
- cflagsMacro.c_str (),
- (" $(PROJECT_CFLAGS)" + globalCflags).c_str () );
-
- fprintf (
- fMakefile,
- "%s +=%s\n",
- cxxflagsMacro.c_str (),
- (" $(PROJECT_CXXFLAGS)" + globalCflags).c_str () );
-
fprintf (
fMakefile,
"%s += $(PROJECT_RCFLAGS)\n",
@@ -1956,18 +1955,6 @@
{
fprintf (
fMakefile,
- "%s +=%s\n",
- cflagsMacro.c_str (),
- globalCflags.c_str () );
-
- fprintf (
- fMakefile,
- "%s +=%s\n",
- cxxflagsMacro.c_str (),
- globalCflags.c_str () );
-
- fprintf (
- fMakefile,
"%s_LFLAGS += $(HOST_LFLAGS)\n",
module.name.c_str () );
}
@@ -1985,10 +1972,6 @@
"%s += %s\n\n",
cflagsMacro.c_str (),
cflags );
- fprintf ( fMakefile,
- "%s += %s\n\n",
- cxxflagsMacro.c_str (),
- cflags );
}
const char* nasmflags = ModuleHandlerInformations[module.type].nasmflags;
@@ -2014,17 +1997,12 @@
fprintf ( fMakefile,
"%s += -Wno-main\n\n",
cflagsMacro.c_str () );
- fprintf ( fMakefile,
- "%s += -Wno-main\n\n",
- cxxflagsMacro.c_str () );
}
fprintf ( fMakefile, "\n\n" );
// future references to the macros will be to get their values
- commonflagsMacro = ssprintf ("$(%s)", commonflagsMacro.c_str ());
cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ());
- cxxflagsMacro = ssprintf ("$(%s)", cxxflagsMacro.c_str ());
nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ());
widlflagsMacro = ssprintf ("$(%s)", widlflagsMacro.c_str ());
}
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h?rev=37631&r1=37630&r2=37631&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Tue Nov 25 08:11:55 2008
@@ -98,6 +98,7 @@
const Module& module ) const;
std::string GetPreconditionDependenciesName () const;
+ std::string GetCFlagsMacro () const;
static std::string GetObjectsMacro ( const Module& );
std::string GetLinkingDependenciesMacro () const;
std::string GetLibsMacro () const;
@@ -171,9 +172,7 @@
public:
const Module& module;
string_list clean_files;
- std::string commonflagsMacro;
std::string cflagsMacro;
- std::string cxxflagsMacro;
std::string nasmflagsMacro;
std::string windresflagsMacro;
std::string widlflagsMacro;
More information about the Ros-diffs
mailing list