Author: tkreuzer
Date: Tue Jul 20 03:01:57 2010
New Revision: 48128

URL: http://svn.reactos.org/svn/reactos?rev=48128&view=rev
Log:
[RBUILD]
For amd64 builds, invoke wrc directly, instead of using gcc to preprocess the 
files. The reason is that newer gcc versions (like 4.5.0) don't support 
multiline continuation  (backslash-newline) except for preprocessor directives, 
but that breaks wine resource strings. This might have to be done for i386 
builds too, sooner or later.

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/rules.mak

Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/rules.mak?rev=48128&r1=48127&r2=48128&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Tue Jul 20 
03:01:57 2010
@@ -227,7 +227,11 @@
 
 ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) $(3) 
$$(wrc_TARGET) | ${call RBUILD_intermediate_dir,$(2)}
        $$(ECHO_RC)
+ifeq ($(ARCH),amd64)
+       $$(Q)$$(wrc_TARGET) --input=$$< -o $$@ ${call 
RBUILD_rc_pp_flags,$(1),$(4)} ${call RBUILD_rc_flags,$(1),$(4),-I${call 
RBUILD_dir,$(2)}}
+else
        ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | 
$$(wrc_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call 
RBUILD_dir,$(2)}}
+endif
 
 endif
 


Reply via email to