diff --git a/reactos/ReactOS-arm.rbuild b/reactos/ReactOS-arm.rbuild
index 5f6e7b792c9..20207320f1f 100644
--- a/reactos/ReactOS-arm.rbuild
+++ b/reactos/ReactOS-arm.rbuild
@@ -12,6 +12,7 @@
+
1
diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild
index 540bb9ab594..e1cfc85985a 100644
--- a/reactos/ReactOS-generic.rbuild
+++ b/reactos/ReactOS-generic.rbuild
@@ -4,6 +4,8 @@
+
+
1
@@ -74,6 +76,11 @@
include/reactos/mc
include/reactos/libs
+ include
+ include
+ include/reactos
+ include/reactos/wine
+
diff --git a/reactos/ReactOS-i386.rbuild b/reactos/ReactOS-i386.rbuild
index 8ddfbb57622..ae727575ce1 100644
--- a/reactos/ReactOS-i386.rbuild
+++ b/reactos/ReactOS-i386.rbuild
@@ -12,6 +12,7 @@
+
diff --git a/reactos/base/applications/winhlp32/winhlp32.rbuild b/reactos/base/applications/winhlp32/winhlp32.rbuild
index 1730cb56fac..1ad54f435f3 100644
--- a/reactos/base/applications/winhlp32/winhlp32.rbuild
+++ b/reactos/base/applications/winhlp32/winhlp32.rbuild
@@ -2,6 +2,7 @@
.
+ include/reactos/wine
wine
comdlg32
comctl32
diff --git a/reactos/dll/directx/quartz/quartz.rbuild b/reactos/dll/directx/quartz/quartz.rbuild
index 03474d92158..c7027648ba1 100644
--- a/reactos/dll/directx/quartz/quartz.rbuild
+++ b/reactos/dll/directx/quartz/quartz.rbuild
@@ -5,6 +5,7 @@
.
+ include/reactos/wine
0x600
wine
uuid
diff --git a/reactos/dll/win32/netshell/precomp.h b/reactos/dll/win32/netshell/precomp.h
index 66613ac8cca..fa75e02d7c7 100644
--- a/reactos/dll/win32/netshell/precomp.h
+++ b/reactos/dll/win32/netshell/precomp.h
@@ -1,8 +1,6 @@
#ifndef _PRECOMP_H__
#define _PRECOMP_H__
-#include "config.h"
-
#include
#include
#include
diff --git a/reactos/dll/win32/user32/misc/dde.c b/reactos/dll/win32/user32/misc/dde.c
index a5617e9650e..37d3e99bd56 100644
--- a/reactos/dll/win32/user32/misc/dde.c
+++ b/reactos/dll/win32/user32/misc/dde.c
@@ -23,8 +23,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include
#include "dde_private.h"
#include "wine/unicode.h"
diff --git a/reactos/include/reactos/config.h b/reactos/include/reactos/config.h
deleted file mode 100644
index e11266e8ca5..00000000000
--- a/reactos/include/reactos/config.h
+++ /dev/null
@@ -1,41 +0,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 */
diff --git a/reactos/lib/cmlib/cmlib.rbuild b/reactos/lib/cmlib/cmlib.rbuild
index 61392ce730c..621988fca2c 100644
--- a/reactos/lib/cmlib/cmlib.rbuild
+++ b/reactos/lib/cmlib/cmlib.rbuild
@@ -16,8 +16,6 @@
.
- include/reactos
- include
diff --git a/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild b/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild
index d4c83dad48a..15025ed2ad5 100644
--- a/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild
+++ b/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild
@@ -1,6 +1,5 @@
- include
wcsfuncs.c
diff --git a/reactos/lib/inflib/inflib.rbuild b/reactos/lib/inflib/inflib.rbuild
index 23de4ac413a..7004583fa76 100644
--- a/reactos/lib/inflib/inflib.rbuild
+++ b/reactos/lib/inflib/inflib.rbuild
@@ -13,14 +13,12 @@
.
- include/reactos
-Wpointer-arith
-Wconversion
-Wstrict-prototypes
-Wmissing-prototypes
- include
infcore.c
infget.c
infput.c
diff --git a/reactos/tools/cabman/cabman.rbuild b/reactos/tools/cabman/cabman.rbuild
index 79f34335d0f..ef058bbbb92 100644
--- a/reactos/tools/cabman/cabman.rbuild
+++ b/reactos/tools/cabman/cabman.rbuild
@@ -1,7 +1,6 @@
- include
.
zlibhost
cabinet.cxx
diff --git a/reactos/tools/mkhive/mkhive.rbuild b/reactos/tools/mkhive/mkhive.rbuild
index 0eed6bfa1f4..341d1dc15c7 100644
--- a/reactos/tools/mkhive/mkhive.rbuild
+++ b/reactos/tools/mkhive/mkhive.rbuild
@@ -1,8 +1,6 @@
- include
- include/reactos
.
.
.
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index a444c18151e..0e68730afd3 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -590,20 +590,6 @@ MingwModuleHandler::GenerateGccDefineParametersFromVector (
return parameters;
}
-string
-MingwModuleHandler::GenerateGccDefineParameters () const
-{
- set 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,
@@ -631,19 +617,6 @@ MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector 0 )
- {
- parameters += " ";
- parameters += s;
- }
- return parameters;
-}
-
string
MingwModuleHandler::GenerateCompilerParametersFromVector ( const vector& compilerFlags, const CompilerType type ) const
{
@@ -1870,7 +1843,11 @@ MingwModuleHandler::GenerateOtherMacros ()
&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 @@ MingwModuleHandler::GenerateOtherMacros ()
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";
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index bf5e4a6e16d..556cf5d3cc3 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -116,7 +116,6 @@ protected:
private:
std::string ConcatenatePaths ( const std::string& path1,
const std::string& path2 ) const;
- std::string GenerateGccDefineParameters () const;
std::string GenerateCompilerParametersFromVector ( const std::vector& compilerFlags, const CompilerType type ) const;
std::string GenerateLinkerParametersFromVector ( const std::vector& linkerFlags ) const;
std::string GenerateImportLibraryDependenciesFromVector ( const std::vector& libraries );
@@ -132,9 +131,6 @@ private:
std::set& 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,
diff --git a/reactos/tools/rbuild/project.cpp b/reactos/tools/rbuild/project.cpp
index deb288c5394..86601203b4d 100644
--- a/reactos/tools/rbuild/project.cpp
+++ b/reactos/tools/rbuild/project.cpp
@@ -306,6 +306,7 @@ Project::ProcessXML ( const string& path )
}
non_if_data.ProcessXML ();
+ host_non_if_data.ProcessXML ();
non_if_data.ExtractModules( modules );
@@ -359,14 +360,26 @@ Project::ProcessXMLSubElement ( const XMLElement& e,
}
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" )
diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index 2e5645cf807..3d87200ed4f 100644
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -236,6 +236,7 @@ public:
std::vector installfiles;
std::map modules;
IfableData non_if_data;
+ IfableData host_non_if_data;
Project ( const Configuration& configuration,
const std::string& filename,
diff --git a/reactos/tools/unicode/unicode.rbuild b/reactos/tools/unicode/unicode.rbuild
index f43be12ed9e..478e5bc8333 100644
--- a/reactos/tools/unicode/unicode.rbuild
+++ b/reactos/tools/unicode/unicode.rbuild
@@ -2,9 +2,6 @@
" "
- include/reactos/wine
- include/reactos
- include
casemap.c
compose.c
cptable.c
diff --git a/reactos/tools/widl/widl.rbuild b/reactos/tools/widl/widl.rbuild
index ddba3f7f1a4..7901c19cc3a 100644
--- a/reactos/tools/widl/widl.rbuild
+++ b/reactos/tools/widl/widl.rbuild
@@ -4,10 +4,6 @@
SHORT
1
.
- include/reactos/wine
- include/reactos
- include
- include
wpp
client.c
hash.c
diff --git a/reactos/tools/winebuild/main.c b/reactos/tools/winebuild/main.c
index 6614680f5a8..f588132950d 100644
--- a/reactos/tools/winebuild/main.c
+++ b/reactos/tools/winebuild/main.c
@@ -48,16 +48,10 @@ int verbose = 0;
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
diff --git a/reactos/tools/winebuild/winebuild.rbuild b/reactos/tools/winebuild/winebuild.rbuild
index 5398fc0ff4f..4e26e551d8d 100644
--- a/reactos/tools/winebuild/winebuild.rbuild
+++ b/reactos/tools/winebuild/winebuild.rbuild
@@ -1,10 +1,6 @@
- include/reactos/wine
- include/reactos
- include
- include
import.c
main.c
parser.c
diff --git a/reactos/tools/wmc/wmc.rbuild b/reactos/tools/wmc/wmc.rbuild
index ef89b145008..6822c8297c5 100644
--- a/reactos/tools/wmc/wmc.rbuild
+++ b/reactos/tools/wmc/wmc.rbuild
@@ -3,10 +3,6 @@
" "
.
- include/reactos/wine
- include/reactos
- include
- include
unicode
lang.c
mcl.c
diff --git a/reactos/tools/wpp/wpp.rbuild b/reactos/tools/wpp/wpp.rbuild
index 8e4ca429fd2..360aae86b7b 100644
--- a/reactos/tools/wpp/wpp.rbuild
+++ b/reactos/tools/wpp/wpp.rbuild
@@ -1,10 +1,6 @@
- include/reactos/wine
- include/reactos
- include
- include
lex.yy.c
preproc.c
wpp.c
diff --git a/reactos/tools/wrc/wrc.rbuild b/reactos/tools/wrc/wrc.rbuild
index c7d4275064b..4ea83b37223 100644
--- a/reactos/tools/wrc/wrc.rbuild
+++ b/reactos/tools/wrc/wrc.rbuild
@@ -4,10 +4,6 @@
" "
- include/reactos/wine
- include/reactos
- include
- include
unicode
wpp
dumpres.c