mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 14:37:45 +00:00
Move gcc -g and -Wall options out of rbuild and into .rbuild files
Move non-architecture-specific msc options to ReactOS-generic.rbuild svn path=/trunk/; revision=41520
This commit is contained in:
parent
da2965ea12
commit
586a1d0fff
|
@ -14,6 +14,9 @@
|
||||||
<define name="__arm__" />
|
<define name="__arm__" />
|
||||||
<define name="TARGET_arm" host="true" />
|
<define name="TARGET_arm" host="true" />
|
||||||
|
|
||||||
|
<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
|
||||||
|
<compilerflag compiler="as">-gstabs+</compilerflag>
|
||||||
|
|
||||||
<if property="DBG" value="1">
|
<if property="DBG" value="1">
|
||||||
<define name="DBG">1</define>
|
<define name="DBG">1</define>
|
||||||
<define name="_SEH_ENABLE_TRACE" />
|
<define name="_SEH_ENABLE_TRACE" />
|
||||||
|
|
|
@ -126,7 +126,14 @@
|
||||||
<xi:include href="tools/tools.rbuild" />
|
<xi:include href="tools/tools.rbuild" />
|
||||||
</directory>
|
</directory>
|
||||||
|
|
||||||
<compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag>
|
<group compilerset="gcc">
|
||||||
|
<compilerflag>-Wall</compilerflag>
|
||||||
<compilerflag compilerset="msc">/wd4711</compilerflag>
|
<compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
<group compilerset="msc">
|
||||||
|
<compilerflag>/Zl</compilerflag>
|
||||||
|
<compilerflag>/Zi</compilerflag>
|
||||||
|
<compilerflag>/W1</compilerflag>
|
||||||
|
</group>
|
||||||
</group>
|
</group>
|
||||||
|
|
|
@ -43,6 +43,8 @@
|
||||||
<compilerflag>-Wno-strict-aliasing</compilerflag>
|
<compilerflag>-Wno-strict-aliasing</compilerflag>
|
||||||
<compilerflag>-Wpointer-arith</compilerflag>
|
<compilerflag>-Wpointer-arith</compilerflag>
|
||||||
<compilerflag>-Wno-multichar</compilerflag>
|
<compilerflag>-Wno-multichar</compilerflag>
|
||||||
|
|
||||||
|
<compilerflag>-gstabs+</compilerflag>
|
||||||
<!-- compilerflag>-H</compilerflag> enable this for header traces -->
|
<!-- compilerflag>-H</compilerflag> enable this for header traces -->
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
|
@ -70,11 +72,10 @@
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
<compilerflag>/GS-</compilerflag>
|
<compilerflag>/GS-</compilerflag>
|
||||||
<compilerflag>/Zl</compilerflag>
|
|
||||||
<compilerflag>/Zi</compilerflag>
|
|
||||||
<compilerflag>/Wall</compilerflag>
|
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
|
<compilerflag compiler="as">-gstabs+</compilerflag>
|
||||||
|
|
||||||
<group linkerset="ld">
|
<group linkerset="ld">
|
||||||
<linkerflag>-disable-stdcall-fixup</linkerflag>
|
<linkerflag>-disable-stdcall-fixup</linkerflag>
|
||||||
</group>
|
</group>
|
||||||
|
|
|
@ -20,4 +20,6 @@
|
||||||
<compilerflag>-meabi</compilerflag>
|
<compilerflag>-meabi</compilerflag>
|
||||||
<compilerflag>-O2</compilerflag>
|
<compilerflag>-O2</compilerflag>
|
||||||
<compilerflag>-Wno-strict-aliasing</compilerflag>
|
<compilerflag>-Wno-strict-aliasing</compilerflag>
|
||||||
|
<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
|
||||||
|
<compilerflag compiler="as">-gstabs+</compilerflag>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -455,8 +455,6 @@ MingwBackend::GenerateGlobalVariables () const
|
||||||
|
|
||||||
if ( ProjectNode.configuration.Compiler == GnuGcc )
|
if ( ProjectNode.configuration.Compiler == GnuGcc )
|
||||||
{
|
{
|
||||||
fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
|
|
||||||
fprintf ( fMakefile, "PROJECT_CXXFLAGS += -Wall\n" );
|
|
||||||
fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
|
fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
|
||||||
fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" );
|
fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" );
|
||||||
fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" );
|
fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" );
|
||||||
|
@ -466,10 +464,6 @@ MingwBackend::GenerateGlobalVariables () const
|
||||||
fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\n" );
|
fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\n" );
|
||||||
fprintf ( fMakefile, "endif\n" );
|
fprintf ( fMakefile, "endif\n" );
|
||||||
|
|
||||||
fprintf ( fMakefile, "PROJECT_CFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" );
|
|
||||||
fprintf ( fMakefile, "PROJECT_CXXFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" );
|
|
||||||
fprintf ( fMakefile, "PROJECT_ASFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" );
|
|
||||||
|
|
||||||
if ( usePipe )
|
if ( usePipe )
|
||||||
{
|
{
|
||||||
fprintf ( fMakefile, "PROJECT_CFLAGS += -pipe\n" );
|
fprintf ( fMakefile, "PROJECT_CFLAGS += -pipe\n" );
|
||||||
|
|
Loading…
Reference in a new issue