[ros-diffs] [hpoussin] 28453: Move generic part of ReactOS-$(ARCH).rbuild to ReactOS-generic.rbuild
hpoussin at svn.reactos.org
hpoussin at svn.reactos.org
Wed Aug 22 17:06:43 CEST 2007
Author: hpoussin
Date: Wed Aug 22 19:06:43 2007
New Revision: 28453
URL: http://svn.reactos.org/svn/reactos?rev=28453&view=rev
Log:
Move generic part of ReactOS-$(ARCH).rbuild to ReactOS-generic.rbuild
Added:
trunk/reactos/ReactOS-generic.rbuild
- copied, changed from r28429, trunk/reactos/ReactOS-i386.rbuild
Modified:
trunk/reactos/ReactOS-i386.rbuild
trunk/reactos/ReactOS-ppc.rbuild
Copied: trunk/reactos/ReactOS-generic.rbuild (from r28429, trunk/reactos/ReactOS-i386.rbuild)
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?p2=trunk/reactos/ReactOS-generic.rbuild&p1=trunk/reactos/ReactOS-i386.rbuild&r1=28429&r2=28453&rev=28453&view=diff
==============================================================================
--- trunk/reactos/ReactOS-i386.rbuild (original)
+++ trunk/reactos/ReactOS-generic.rbuild Wed Aug 22 19:06:43 2007
@@ -1,59 +1,21 @@
<?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="config.rbuild">
- <xi:fallback>
- <xi:include href="config.template.rbuild" />
- </xi:fallback>
- </xi:include>
-
+<project name="ReactOS" xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="baseaddress.rbuild" />
- <define name="_M_IX86" />
- <define name="_X86_" />
- <define name="__i386__" />
<define name="_REACTOS_" />
<if property="MP" value="1">
<define name="CONFIG_SMP" value="1" />
</if>
<if property="DBG" value="1">
<define name="DBG" value="1" />
- <define name="_SEH_ENABLE_TRACE" />
+ <define name="_SEH_ENABLE_TRACE" />
<property name="DBG_OR_KDBG" value="true" />
</if>
<if property="KDBG" value="1">
<define name="KDBG" value="1" />
<property name="DBG_OR_KDBG" value="true" />
</if>
-
- <if property="GDB" value="0">
- <if property="OPTIMIZE" value="1">
- <compilerflag>-Os</compilerflag>
- <compilerflag>-ftracer</compilerflag>
- <compilerflag>-momit-leaf-frame-pointer</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- <if property="OPTIMIZE" value="2">
- <compilerflag>-Os</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- <if property="OPTIMIZE" value="3">
- <compilerflag>-O1</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- <if property="OPTIMIZE" value="4">
- <compilerflag>-O2</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- <if property="OPTIMIZE" value="5">
- <compilerflag>-O3</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- </if>
-
- <compilerflag>-Wno-strict-aliasing</compilerflag>
- <compilerflag>-Wpointer-arith</compilerflag>
- <linkerflag>-enable-stdcall-fixup</linkerflag>
<include>.</include>
<include>include</include>
Modified: trunk/reactos/ReactOS-i386.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=28453&r1=28452&r2=28453&view=diff
==============================================================================
--- trunk/reactos/ReactOS-i386.rbuild (original)
+++ trunk/reactos/ReactOS-i386.rbuild Wed Aug 22 19:06:43 2007
@@ -7,24 +7,11 @@
</xi:fallback>
</xi:include>
- <xi:include href="baseaddress.rbuild" />
+ <xi:include href="ReactOS-generic.rbuild" />
<define name="_M_IX86" />
<define name="_X86_" />
<define name="__i386__" />
- <define name="_REACTOS_" />
- <if property="MP" value="1">
- <define name="CONFIG_SMP" value="1" />
- </if>
- <if property="DBG" value="1">
- <define name="DBG" value="1" />
- <define name="_SEH_ENABLE_TRACE" />
- <property name="DBG_OR_KDBG" value="true" />
- </if>
- <if property="KDBG" value="1">
- <define name="KDBG" value="1" />
- <property name="DBG_OR_KDBG" value="true" />
- </if>
<if property="GDB" value="0">
<if property="OPTIMIZE" value="1">
@@ -55,52 +42,4 @@
<compilerflag>-Wpointer-arith</compilerflag>
<linkerflag>-enable-stdcall-fixup</linkerflag>
- <include>.</include>
- <include>include</include>
- <include root="intermediate">include</include>
- <include>include/psdk</include>
- <include root="intermediate">include/psdk</include>
- <include>include/dxsdk</include>
- <include>include/crt</include>
- <include>include/ddk</include>
- <include>include/GL</include>
- <include>include/ndk</include>
- <include>include/reactos</include>
- <include root="intermediate">include/reactos</include>
- <include>include/reactos/libs</include>
-
- <directory name="base">
- <xi:include href="base/base.rbuild" />
- </directory>
- <directory name="boot">
- <xi:include href="boot/boot.rbuild" />
- </directory>
- <directory name="dll">
- <xi:include href="dll/dll.rbuild" />
- </directory>
- <directory name="drivers">
- <xi:include href="drivers/drivers.rbuild" />
- </directory>
- <directory name="hal">
- <xi:include href="hal/hal.rbuild" />
- </directory>
- <directory name="include">
- <xi:include href="include/directory.rbuild" />
- </directory>
- <directory name="lib">
- <xi:include href="lib/lib.rbuild" />
- </directory>
- <directory name="media">
- <xi:include href="media/media.rbuild" />
- </directory>
- <directory name="modules">
- <xi:include href="modules/directory.rbuild" />
- </directory>
- <directory name="ntoskrnl">
- <xi:include href="ntoskrnl/ntoskrnl.rbuild" />
- </directory>
- <directory name="subsystems">
- <xi:include href="subsystems/subsystems.rbuild" />
- </directory>
-
</project>
Modified: trunk/reactos/ReactOS-ppc.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=28453&r1=28452&r2=28453&view=diff
==============================================================================
--- trunk/reactos/ReactOS-ppc.rbuild (original)
+++ trunk/reactos/ReactOS-ppc.rbuild Wed Aug 22 19:06:43 2007
@@ -7,7 +7,7 @@
</xi:fallback>
</xi:include>
- <xi:include href="baseaddress.rbuild" />
+ <xi:include href="ReactOS-generic.rbuild" />
<property name="BOOTPROG_PREPARE" value="ppc-le2be" />
<property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" />
@@ -17,7 +17,6 @@
<define name="_M_PPC" />
<define name="_PPC_" />
<define name="__PowerPC__" />
- <define name="_REACTOS_" />
<define name="__MINGW_IMPORT" empty="true" />
<define name="stdcall" empty="true" />
<define name="__stdcall__" empty="true" />
@@ -26,69 +25,6 @@
<define name="__cdecl__" empty="true" />
<define name="dllimport" empty="true" />
<compilerflag>-v</compilerflag>
- <if property="MP" value="1">
- <define name="CONFIG_SMP" value="1" />
- </if>
- <if property="DBG" value="1">
- <define name="DBG" value="1" />
- <property name="DBG_OR_KDBG" value="true" />
- </if>
- <if property="DBG" value="0">
- <compilerflag>-Os</compilerflag>
- <compilerflag>-Wno-strict-aliasing</compilerflag>
- </if>
- <if property="KDBG" value="1">
- <define name="KDBG" value="1" />
- <property name="DBG_OR_KDBG" value="true" />
- </if>
<compilerflag>-Wpointer-arith</compilerflag>
- <include>.</include>
- <include>include</include>
- <include>include/reactos</include>
- <include>include/libs</include>
- <include>include/drivers</include>
- <include>include/subsys</include>
- <include>include/ndk</include>
- <include>include</include>
- <include>include/crt</include>
- <include>include/ddk</include>
-
- <directory name="base">
- <xi:include href="base/base.rbuild" />
- </directory>
- <directory name="boot">
- <xi:include href="boot/boot.rbuild" />
- </directory>
- <directory name="dll">
- <xi:include href="dll/dll.rbuild" />
- </directory>
- <directory name="drivers">
- <xi:include href="drivers/drivers.rbuild" />
- </directory>
- <directory name="hal">
- <xi:include href="hal/hal.rbuild" />
- </directory>
- <directory name="include">
- <xi:include href="include/directory.rbuild" />
- </directory>
- <directory name="lib">
- <xi:include href="lib/lib.rbuild" />
- </directory>
- <directory name="media">
- <xi:include href="media/media.rbuild" />
- </directory>
- <directory name="modules">
- <xi:include href="modules/directory.rbuild" />
- </directory>
- <directory name="ntoskrnl">
- <xi:include href="ntoskrnl/ntoskrnl.rbuild" />
- </directory>
- <directory name="regtests">
- <xi:include href="regtests/directory.rbuild" />
- </directory>
- <directory name="subsystems">
- <xi:include href="subsystems/subsystems.rbuild" />
- </directory>
-
</project>
More information about the Ros-diffs
mailing list