[ros-diffs] [hpoussin] 29180: Do not use host headers anymore when building target executables/libraries

Author: hpoussin
Date: Mon Sep 24 15:43:38 2007
New Revision: 29180

URL: http://svn.reactos.org/svn/reactos?rev=29180&view=rev
Log:
Do not use host headers anymore when building target executables/libraries

Modified:
    trunk/reactos/ReactOS-generic.rbuild
    trunk/reactos/lib/sdk/crt/signal/signal.c
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp

Modified: trunk/reactos/ReactOS-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev…
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild (original)
+++ trunk/reactos/ReactOS-generic.rbuild Mon Sep 24 15:43:38 2007
@@ -24,6 +24,7 @@
 	<include root="intermediate">include/psdk</include>
 	<include>include/dxsdk</include>
 	<include>include/crt</include>
+	<include>include/crt/mingw32</include>
 	<include>include/ddk</include>
 	<include>include/GL</include>
 	<include>include/ndk</include>

Modified: trunk/reactos/lib/sdk/crt/signal/signal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/signal/signal.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/signal/signal.c (original)
+++ trunk/reactos/lib/sdk/crt/signal/signal.c Mon Sep 24 15:43:38 2007
@@ -5,9 +5,6 @@
 #include <string.h>
 
 void _default_handler(int signal);
-
-typedef void (*__p_sig_fn_t)(int);
-
 
 typedef struct _sig_element
 {

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 (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 24 15:43:38 2007
@@ -1945,7 +1945,21 @@
 	if ( !module.allowWarnings )
 		globalCflags += " -Werror";
 	if ( module.host == HostTrue )
-		globalCflags += " $(HOST_CFLAGS)";
+	{
+		if ( module.cplusplus )
+			globalCflags += " $(HOST_CPPFLAGS)";
+		else
+			globalCflags += " $(HOST_CFLAGS)";
+	}
+	else
+	{
+		globalCflags += " -nostdinc";
+		if ( module.cplusplus )
+		{
+			// HACK: use host headers when building C++
+			globalCflags += " $(HOST_CPPFLAGS)";
+		}
+	}
 
 	// Always force disabling of sibling calls optimisation for GCC
 	// (TODO: Move to version-specific once this bug is fixed in GCC)