[ros-diffs] [hyperion] 41520: Move gcc -g and -Wall options out of rbuild and into .rbuild files Move non-architecture-specific msc options to ReactOS-generic.rbuild

[hyperion at svn.reactos.org]

Author: hyperion
Date: Mon Jun 22 02:13:28 2009
New Revision: 41520

URL: http://svn.reactos.org/svn/reactos?rev=41520&view=rev
Log:
Move gcc -g and -Wall options out of rbuild and into .rbuild files
Move non-architecture-specific msc options to ReactOS-generic.rbuild

Modified:
    trunk/reactos/ReactOS-arm.rbuild
    trunk/reactos/ReactOS-generic.rbuild
    trunk/reactos/ReactOS-i386.rbuild
    trunk/reactos/ReactOS-ppc.rbuild
    trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp

Modified: trunk/reactos/ReactOS-arm.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=41520&r1=41519&r2=41520&view=diff
==============================================================================
--- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009
@@ -13,6 +13,9 @@
 	<define name="_ARM_" />
 	<define name="__arm__" />
 	<define name="TARGET_arm" host="true" />
+
+	<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+	<compilerflag compiler="as">-gstabs+</compilerflag>
 
 	<if property="DBG" value="1">
 		<define name="DBG">1</define>

Modified: trunk/reactos/ReactOS-generic.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev=41520&r1=41519&r2=41520&view=diff
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009
@@ -126,7 +126,14 @@
 		<xi:include href="tools/tools.rbuild" />
 	</directory>
 
-	<compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag>-Wall</compilerflag>
+		<compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag>
+	</group>
 
-	<compilerflag compilerset="msc">/wd4711</compilerflag>
+	<group compilerset="msc">
+		<compilerflag>/Zl</compilerflag>
+		<compilerflag>/Zi</compilerflag>
+		<compilerflag>/W1</compilerflag>
+	</group>
 </group>

Modified: trunk/reactos/ReactOS-i386.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=41520&r1=41519&r2=41520&view=diff
==============================================================================
--- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009
@@ -43,6 +43,8 @@
 		<compilerflag>-Wno-strict-aliasing</compilerflag>
 		<compilerflag>-Wpointer-arith</compilerflag>
 		<compilerflag>-Wno-multichar</compilerflag>
+
+		<compilerflag>-gstabs+</compilerflag>
 		<!-- compilerflag>-H</compilerflag>    enable this for header traces -->
 	</group>
 
@@ -70,10 +72,9 @@
 		</if>
 
 		<compilerflag>/GS-</compilerflag>
-		<compilerflag>/Zl</compilerflag>
-		<compilerflag>/Zi</compilerflag>
-		<compilerflag>/Wall</compilerflag>
 	</group>
+
+	<compilerflag compiler="as">-gstabs+</compilerflag>
 
 	<group linkerset="ld">
 		<linkerflag>-disable-stdcall-fixup</linkerflag>

Modified: trunk/reactos/ReactOS-ppc.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=41520&r1=41519&r2=41520&view=diff
==============================================================================
--- trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009
@@ -20,4 +20,6 @@
 	<compilerflag>-meabi</compilerflag>
 	<compilerflag>-O2</compilerflag>
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
+	<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+	<compilerflag compiler="as">-gstabs+</compilerflag>
 </project>

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=41520&r1=41519&r2=41520&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] Mon Jun 22 02:13:28 2009
@@ -455,8 +455,6 @@
 
 	if ( ProjectNode.configuration.Compiler == GnuGcc )
 	{
-		fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
-		fprintf ( fMakefile, "PROJECT_CXXFLAGS += -Wall\n" );
 		fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
 		fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" );
 		fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" );
@@ -465,10 +463,6 @@
 		fprintf ( fMakefile, "PROJECT_CFLAGS += -mtune=$(TUNE)\n" );
 		fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\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 )
 		{