[ros-diffs] [cfinck] 32459: - Add the architecture-specific defines back to the .rbuild files. At the current state, there is no reason for them to be automatically added by rbuild. - Add back NTOSKRNL_SHARED as well, it's not the same value for i386 and PPC - Remove SILLY_DEFINE :D

Author: cfinck
Date: Sat Feb 23 22:13:35 2008
New Revision: 32459

URL: http://svn.reactos.org/svn/reactos?rev=32459&view=rev
Log:
- Add the architecture-specific defines back to the .rbuild files.
  At the current state, there is no reason for them to be automatically added by rbuild.
- Add back NTOSKRNL_SHARED as well, it's not the same value for i386 and PPC
- Remove SILLY_DEFINE :D

Modified:
    branches/rbuild/reactos/ReactOS-i386.rbuild
    branches/rbuild/reactos/ReactOS-ppc.rbuild
    branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    branches/rbuild/reactos/tools/rbuild/project.cpp

Modified: branches/rbuild/reactos/ReactOS-i386.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-i386.rbui...
==============================================================================
--- branches/rbuild/reactos/ReactOS-i386.rbuild (original)
+++ branches/rbuild/reactos/ReactOS-i386.rbuild Sat Feb 23 22:13:35 2008
@@ -9,6 +9,12 @@

<xi:include href="ReactOS-generic.rbuild" />

+	<define name="_M_IX86" />
+	<define name="_X86_" />
+	<define name="__i386__" />
+
+	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/>
+	
    <if property="GDB" value="0">
    	<if property="OPTIMIZE" value="1">
    			<compilerflag>-Os</compilerflag>
@@ -37,10 +43,4 @@
    <compilerflag>-Wno-strict-aliasing</compilerflag>
    <compilerflag>-Wpointer-arith</compilerflag>
    <linkerflag>-enable-stdcall-fixup</linkerflag>
-
-
-	<overridemodule name="ntoskrnl" allowwarnings="true">
-		<define name="SILLY_DEFINE" />
-	</overridemodule>
-
 </project>

Modified: branches/rbuild/reactos/ReactOS-ppc.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-ppc.rbuil...
==============================================================================
--- branches/rbuild/reactos/ReactOS-ppc.rbuild (original)
+++ branches/rbuild/reactos/ReactOS-ppc.rbuild Sat Feb 23 22:13:35 2008
@@ -8,6 +8,10 @@
    </xi:include>

<xi:include href="ReactOS-generic.rbuild" />
+
+	<define name="_M_PPC" />
+	<define name="_PPC_" />
+	<define name="__PowerPC__" />

<property name="MKHIVE_OPTIONS" value="-be" />
    <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/>

Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/back...
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Feb 23 22:13:35 2008
@@ -2615,7 +2615,7 @@
    	                                     module.baseaddress.c_str () );
    	GenerateLinkerCommand ( dependencies,
    				"${gcc}",
-					linkerParameters + " -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared",
+					linkerParameters + " $(NTOSKRNL_SHARED)",
    				objectsMacro,
    				libsMacro,
    				"-sections" );

Modified: branches/rbuild/reactos/tools/rbuild/project.cpp
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/proj...
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/project.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/project.cpp Sat Feb 23 22:13:35 2008
@@ -477,43 +477,6 @@
    	cdfiles[i]->ProcessXML ();
    for ( i = 0; i < installfiles.size (); i++ )
    	installfiles[i]->ProcessXML ();
-
-	switch (architectureType)
-	{
-		case I386:
-		{
-			Define* pDefine = new Define (*this, "_M_IX86" );
-			non_if_data.defines.push_back ( pDefine );
-
-			pDefine = new Define (*this, "_X86_" );
-			non_if_data.defines.push_back ( pDefine );
-			
-			pDefine = new Define (*this, "__i386__" );
-			non_if_data.defines.push_back ( pDefine );
-		}
-		break;
-		case PowerPC:
-		{
-			Define* pDefine = new Define (*this, "_M_PPC" );
-			non_if_data.defines.push_back ( pDefine );
-
-			pDefine = new Define (*this, "_PPC_" );
-			non_if_data.defines.push_back ( pDefine );
-
-			pDefine = new Define (*this, "__PowerPC__" );
-			non_if_data.defines.push_back ( pDefine );
-		}
-		break;
-		case ARM:
-		{
-			Define* pDefine = new Define (*this, "_ARM_" );
-			non_if_data.defines.push_back ( pDefine );
-
-			pDefine = new Define (*this, "__arm__" );
-			non_if_data.defines.push_back ( pDefine );
-		}
-		break;
-	}
 }

ArchitectureType