[cfinck] 36995: - Add a "host" attribute to the project's <include> and <define> tags to make it possible to define global includes/defines for host components - Define TARGET_arm/TARGET_i386 in the ReactOS-arm.rbuild/ReactOS-i386.rbuild files for the host tools to make it possible for them to know about the target to build - Make use of this define in winebuild to fix the issue of r36927 properly - Define global includes for host tools to simplify all host tool/library rbuild files - Remove dea

Author: cfinck
Date: Sun Oct 26 13:03:06 2008
New Revision: 36995

URL: http://svn.reactos.org/svn/reactos?rev=36995&view=rev
Log:
- Add a "host" attribute to the project's <include> and <define>
tags to make it possible to define global includes/defines for host components
- Define TARGET_arm/TARGET_i386 in the ReactOS-arm.rbuild/ReactOS-i386.rbuild files for
the host tools to make it possible for them to know about the target to build
- Make use of this define in winebuild to fix the issue of r36927 properly
- Define global includes for host tools to simplify all host tool/library rbuild files
- Remove dead rbuild code

- Remove the include/reactos/config.h file, none of its defines are still used
- Fix components accidentally using that file

Removed:
    trunk/reactos/include/reactos/config.h
Modified:
    trunk/reactos/ReactOS-arm.rbuild
    trunk/reactos/ReactOS-generic.rbuild
    trunk/reactos/ReactOS-i386.rbuild
    trunk/reactos/base/applications/winhlp32/winhlp32.rbuild
    trunk/reactos/dll/directx/quartz/quartz.rbuild
    trunk/reactos/dll/win32/netshell/precomp.h
    trunk/reactos/dll/win32/user32/misc/dde.c
    trunk/reactos/lib/cmlib/cmlib.rbuild
    trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild
    trunk/reactos/lib/inflib/inflib.rbuild
    trunk/reactos/tools/cabman/cabman.rbuild
    trunk/reactos/tools/mkhive/mkhive.rbuild
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
    trunk/reactos/tools/rbuild/project.cpp
    trunk/reactos/tools/rbuild/rbuild.h
    trunk/reactos/tools/unicode/unicode.rbuild
    trunk/reactos/tools/widl/widl.rbuild
    trunk/reactos/tools/winebuild/main.c
    trunk/reactos/tools/winebuild/winebuild.rbuild
    trunk/reactos/tools/wmc/wmc.rbuild
    trunk/reactos/tools/wpp/wpp.rbuild
    trunk/reactos/tools/wrc/wrc.rbuild

Modified: trunk/reactos/ReactOS-arm.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=369…
==============================================================================
--- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -12,6 +12,7 @@
 	<define name="__REACTOS__" />
 	<define name="_ARM_" />
 	<define name="__arm__" />
+	<define name="TARGET_arm" host="true" />
 
 	<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…
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -4,6 +4,8 @@
 	<xi:include href="baseaddress.rbuild" />
 
 	<define name="__REACTOS__" />
+	<define name="__REACTOS__" host="true" />
+
 	<if property="DBG" value="1">
 		<define name="DBG">1</define>
 		<define name="_SEH_ENABLE_TRACE" />
@@ -74,6 +76,11 @@
 	<include root="intermediate">include/reactos/mc</include>
 	<include>include/reactos/libs</include>
 
+	<include host="true">include</include>
+	<include host="true"
root="intermediate">include</include>
+	<include host="true">include/reactos</include>
+	<include host="true">include/reactos/wine</include>
+
 	<directory name="base">
 		<xi:include href="base/base.rbuild" />
 	</directory>

Modified: trunk/reactos/ReactOS-i386.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=36…
==============================================================================
--- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -12,6 +12,7 @@
 	<define name="_M_IX86" />
 	<define name="_X86_" />
 	<define name="__i386__" />
+	<define name="TARGET_i386" host="true" />
 
 	<property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000
-section-alignment=0x1000 -shared"/>
 

Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Sun Oct 26
13:03:06 2008
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="winhlp32" type="win32gui"
installbase="system32" installname="winhlp32.exe"
unicode="no" allowwarnings="true">
 	<include base="winhlp32">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<library>wine</library>
 	<library>comdlg32</library>
 	<library>comctl32</library>

Modified: trunk/reactos/dll/directx/quartz/quartz.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.…
==============================================================================
--- trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -5,6 +5,7 @@
 	<autoregister infsection="OleControlDlls"
type="DllRegisterServer" />
 	<importlibrary definition="quartz.spec" />
 	<include base="quartz">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WIN32_WINNT">0x600</define>
 	<library>wine</library>
 	<library>uuid</library>

Modified: trunk/reactos/dll/win32/netshell/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp…
==============================================================================
--- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -1,7 +1,5 @@
 #ifndef _PRECOMP_H__
 #define _PRECOMP_H__
-
-#include "config.h"
 
 #include <stdarg.h>
 #include <stdlib.h>

Modified: trunk/reactos/dll/win32/user32/misc/dde.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -22,8 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "config.h"
 
 #include <user32.h>
 #include "dde_private.h"

Removed: trunk/reactos/include/reactos/config.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/config.h?r…
==============================================================================
--- trunk/reactos/include/reactos/config.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/config.h (removed)
@@ -1,41 +1,0 @@
-#ifndef _INC_REACTOS_CONFIG_H
-#define _INC_REACTOS_CONFIG_H
-/* $Id$ */
-/* ReactOS global configuration options */
-
-#define CONFIG_PROCESSOR_FAMILY_I386	386L
-#define CONFIG_PROCESSOR_FAMILY_I486	486L
-#define CONFIG_PROCESSOR_FAMILY_I586	586L
-#define CONFIG_PROCESSOR_FAMILY_IPII	686L
-
-#define CONFIG_PROCESSOR_FAMILY_ALPHA	0x10000000
-
-#define CONFIG_ARCHITECTURE_IBMPC	0x00000000
-/*
- * Processor and architecture.
- */
-#define CONFIG_PROCESSOR_FAMILY	CONFIG_PROCESSOR_FAMILY_I586
-#define CONFIG_ARCHITECTURE	CONFIG_ARCHITECTURE_IBMPC
-/*
- * Hardware page size
- */
-#define CONFIG_MEMORY_PAGE_SIZE	4096
-/*
- * Use __fastcall calling conventions when needed
- * in system components that require it.
- */
-
-/* #define CONFIG_USE_FASTCALL */
-
-/*
- * Enable debugging output on a per module
- * base.
- */
-#define DBG_NTOSKRNL_KE_MAIN
-#define DBG_NTOSKRNL_MM_MM
-#define DBG_NTOSKRNL_MM_NPOOL
-
-#define DBG_NTDLL_LDR_STARTUP
-#define DBG_NTDLL_LDR_UTILS
-
-#endif /* ndef _INC_REACTOS_CONFIG_H */

Modified: trunk/reactos/lib/cmlib/cmlib.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev…
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -16,8 +16,6 @@
 </module>
 <module name="cmlibhost" type="hoststaticlibrary">
 	<include base="cmlibhost">.</include>
-	<include base="ReactOS">include/reactos</include>
-	<include base="ReactOS">include</include>
 	<define name="__NO_CTYPE_INLINES" />
 	<define name="_NTOSKRNL_" />
 	<define name="_NTSYSTEM_" />

Modified: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/host/wcsfuncs/wcsfuncs…
==============================================================================
--- trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="host_wcsfuncs" type="hoststaticlibrary">
-	<include base="ReactOS">include</include>
 	<file>wcsfuncs.c</file>
 </module>

Modified: trunk/reactos/lib/inflib/inflib.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?r…
==============================================================================
--- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -13,14 +13,12 @@
 </module>
 <module name="inflibhost" type="hoststaticlibrary"
allowwarnings="true">
 	<include base="inflibhost">.</include>
-	<include base="ReactOS">include/reactos</include>
 	<define name="__NO_CTYPE_INLINES" />
 	<compilerflag>-Wpointer-arith</compilerflag>
 	<compilerflag>-Wconversion</compilerflag>
 	<compilerflag>-Wstrict-prototypes</compilerflag>
 	<compilerflag>-Wmissing-prototypes</compilerflag>
 	<define name="INFLIB_HOST" />
-	<include base="ReactOS">include</include>
 	<file>infcore.c</file>
 	<file>infget.c</file>
 	<file>infput.c</file>

Modified: trunk/reactos/tools/cabman/cabman.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.rbuild…
==============================================================================
--- trunk/reactos/tools/cabman/cabman.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/cabman/cabman.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="cabman" type="buildtool">
-	<include base="ReactOS">include</include>
 	<include base="zlibhost">.</include>
 	<library>zlibhost</library>
 	<file>cabinet.cxx</file>

Modified: trunk/reactos/tools/mkhive/mkhive.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.rbuild…
==============================================================================
--- trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="mkhive" type="buildtool"
allowwarnings="true">
-	<include base="ReactOS">include</include>
-	<include base="ReactOS">include/reactos</include>
 	<include base="inflibhost">.</include>
 	<include base="cmlibhost">.</include>
 	<include base="zlibhost">.</include>

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Oct 26
13:03:06 2008
@@ -591,20 +591,6 @@
 }
 
 string
-MingwModuleHandler::GenerateGccDefineParameters () const
-{
-	set<string> used_defs;
-	string parameters = GenerateGccDefineParametersFromVector (
module.project.non_if_data.defines, used_defs );
-	string s = GenerateGccDefineParametersFromVector ( module.non_if_data.defines, used_defs
);
-	if ( s.length () > 0 )
-	{
-		parameters += " ";
-		parameters += s;
-	}
-	return parameters;
-}
-
-string
 MingwModuleHandler::ConcatenatePaths (
 	const string& path1,
 	const string& path2 ) const
@@ -627,19 +613,6 @@
 		if ( parameters.length () > 0 )
 			parameters += " ";
 		parameters += "-I" + backend->GetFullPath ( *include.directory );;
-	}
-	return parameters;
-}
-
-string
-MingwModuleHandler::GenerateGccIncludeParameters () const
-{
-	string parameters = GenerateGccIncludeParametersFromVector ( module.non_if_data.includes
);
-	string s = GenerateGccIncludeParametersFromVector ( module.project.non_if_data.includes
);
-	if ( s.length () > 0 )
-	{
-		parameters += " ";
-		parameters += s;
 	}
 	return parameters;
 }
@@ -1870,7 +1843,11 @@
 		&module.linkerFlags,
 		used_defs );
 
-	if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse )
+	if ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue )
+	{
+		GenerateMacros("+=", module.project.host_non_if_data, NULL, used_defs);
+	}
+	else
 	{
 		GenerateMacros (
 			"+=",
@@ -1899,7 +1876,7 @@
 	if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse )
 		globalCflags += " $(PROJECT_CFLAGS)";
 	else
-		globalCflags += " -Wall -Wpointer-arith -D__REACTOS__";
+		globalCflags += " -Wall -Wpointer-arith";
 	globalCflags += " -g";
 	if ( backend->usePipe )
 		globalCflags += " -pipe";

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sun Oct 26
13:03:06 2008
@@ -116,7 +116,6 @@
 private:
 	std::string ConcatenatePaths ( const std::string& path1,
 	                               const std::string& path2 ) const;
-	std::string GenerateGccDefineParameters () const;
 	std::string GenerateCompilerParametersFromVector ( const
std::vector<CompilerFlag*>& compilerFlags, const CompilerType type ) const;
 	std::string GenerateLinkerParametersFromVector ( const
std::vector<LinkerFlag*>& linkerFlags ) const;
 	std::string GenerateImportLibraryDependenciesFromVector ( const
std::vector<Library*>& libraries );
@@ -132,9 +131,6 @@
 	                      std::set<const Define *>& used_defs );
 	void GenerateSourceMacros ( const IfableData& data );
 	void GenerateObjectMacros ( const IfableData& data );
-	std::string GenerateGccIncludeParameters () const;
-	std::string GenerateGccParameters () const;
-	std::string GenerateNasmParameters () const;
 	const FileLocation* GetPrecompiledHeaderFilename () const;
 	void GenerateGccCommand ( const FileLocation* sourceFile,
 	                          const Rule *rule,

Modified: trunk/reactos/tools/rbuild/project.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r…
==============================================================================
--- trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -306,6 +306,7 @@
 	}
 
 	non_if_data.ProcessXML ();
+	host_non_if_data.ProcessXML ();
 
 	non_if_data.ExtractModules( modules );
 
@@ -359,14 +360,26 @@
 	}
 	else if ( e.name == "include" )
 	{
+		const XMLAttribute* host = e.GetAttribute("host", false);
 		Include* include = new Include ( *this, &e );
-		non_if_data.includes.push_back ( include );
+
+		if(host && host->value == "true")
+			host_non_if_data.includes.push_back(include);
+		else
+			non_if_data.includes.push_back ( include );
+
 		subs_invalid = true;
 	}
 	else if ( e.name == "define" )
 	{
+		const XMLAttribute* host = e.GetAttribute("host", false);
 		Define* define = new Define ( *this, e );
-		non_if_data.defines.push_back ( define );
+
+		if(host && host->value == "true")
+			host_non_if_data.defines.push_back(define);
+		else
+			non_if_data.defines.push_back ( define );
+
 		subs_invalid = true;
 	}
 	else if ( e.name == "compilerflag" )

Modified: trunk/reactos/tools/rbuild/rbuild.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -236,6 +236,7 @@
 	std::vector<InstallFile*> installfiles;
 	std::map<std::string, Module*> modules;
 	IfableData non_if_data;
+	IfableData host_non_if_data;
 
 	Project ( const Configuration& configuration,
 	          const std::string& filename,

Modified: trunk/reactos/tools/unicode/unicode.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.rbui…
==============================================================================
--- trunk/reactos/tools/unicode/unicode.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/unicode/unicode.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -2,9 +2,6 @@
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="unicode" type="hoststaticlibrary">
 	<define name="WINE_UNICODE_API">" "</define>
-	<include base="ReactOS">include/reactos/wine</include>
-	<include base="ReactOS">include/reactos</include>
-	<include base="ReactOS">include</include>
 	<file>casemap.c</file>
 	<file>compose.c</file>
 	<file>cptable.c</file>

Modified: trunk/reactos/tools/widl/widl.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.rbuild?rev…
==============================================================================
--- trunk/reactos/tools/widl/widl.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/widl/widl.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -4,10 +4,6 @@
 	<define name="INT16">SHORT</define>
 	<define name="YYDEBUG">1</define>
 	<include base="wpp">.</include>
-	<include base="ReactOS">include/reactos/wine</include>
-	<include base="ReactOS">include/reactos</include>
-	<include base="ReactOS">include</include>
-	<include base="ReactOS"
root="intermediate">include</include>
 	<library>wpp</library>
 	<file>client.c</file>
 	<file>hash.c</file>

Modified: trunk/reactos/tools/winebuild/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev…
==============================================================================
--- trunk/reactos/tools/winebuild/main.c [iso-8859-1] (original)
+++ trunk/reactos/tools/winebuild/main.c [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -48,16 +48,10 @@
 int save_temps = 0;
 int link_ext_symbols = 0;
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(TARGET_i386)
 enum target_cpu target_cpu = CPU_x86;
-#elif defined(__x86_64__)
+#elif defined(TARGET_amd64)
 enum target_cpu target_cpu = CPU_x86_64;
-#elif defined(__sparc__)
-enum target_cpu target_cpu = CPU_SPARC;
-#elif defined(__ALPHA__)
-enum target_cpu target_cpu = CPU_ALPHA;
-#elif defined(__powerpc__)
-enum target_cpu target_cpu = CPU_POWERPC;
 #else
 #error Unsupported CPU
 #endif

Modified: trunk/reactos/tools/winebuild/winebuild.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.…
==============================================================================
--- trunk/reactos/tools/winebuild/winebuild.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/winebuild/winebuild.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="winebuild" type="buildtool">
-	<include base="ReactOS">include/reactos/wine</include>
-	<include base="ReactOS">include/reactos</include>
-	<include base="ReactOS">include</include>
-	<include base="ReactOS"
root="intermediate">include</include>
 	<file>import.c</file>
 	<file>main.c</file>
 	<file>parser.c</file>

Modified: trunk/reactos/tools/wmc/wmc.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.rbuild?rev=3…
==============================================================================
--- trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -3,10 +3,6 @@
 <module name="wmc" type="buildtool"
allowwarnings="true">
 	<define name="WINE_UNICODE_API">" "</define>
 	<include base="unicode">.</include>
-	<include base="ReactOS">include/reactos/wine</include>
-	<include base="ReactOS">include/reactos</include>
-	<include base="ReactOS">include</include>
-	<include base="ReactOS"
root="intermediate">include</include>
 	<library>unicode</library>
 	<file>lang.c</file>
 	<file>mcl.c</file>

Modified: trunk/reactos/tools/wpp/wpp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.rbuild?rev=3…
==============================================================================
--- trunk/reactos/tools/wpp/wpp.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/wpp/wpp.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="wpp" type="hoststaticlibrary"
allowwarnings="true">
-	<include base="ReactOS">include/reactos/wine</include>
-	<include base="ReactOS">include/reactos</include>
-	<include base="ReactOS">include</include>
-	<include base="ReactOS"
root="intermediate">include</include>
 	<file>lex.yy.c</file>
 	<file>preproc.c</file>
 	<file>wpp.c</file>

Modified: trunk/reactos/tools/wrc/wrc.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.rbuild?rev=3…
==============================================================================
--- trunk/reactos/tools/wrc/wrc.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/wrc/wrc.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008
@@ -4,10 +4,6 @@
 	<define name="WINE_UNICODE_API">" "</define>
 	<include base="unicode" />
 	<include base="wpp" />
-	<include base="ReactOS">include/reactos/wine</include>
-	<include base="ReactOS">include/reactos</include>
-	<include base="ReactOS">include</include>
-	<include base="ReactOS"
root="intermediate">include</include>
 	<library>unicode</library>
 	<library>wpp</library>
 	<file>dumpres.c</file>