[Libreoffice-commits] core.git: external/firebird

[Peter Foley]

 external/firebird/firebird-cygwin-msvc.patch.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fee691380bf6a6335c274b13865b9a7f71581331
Author: Peter Foley <pefoley2 at pefoley.com>
Date:   Tue Sep 23 21:57:15 2014 -0400

    Fix firebird without cygwin gcc
    
    The firebuild buildsystem calls windres, which depends on cygwin gcc,
    use rc.exe so that a windows build without cygwin gcc will succeed.
    
    Change-Id: Ic7719749b3806232912e3eb8b1ede11e6eb3c10c
    Reviewed-on: https://gerrit.libreoffice.org/11619
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/firebird/firebird-cygwin-msvc.patch.1 b/external/firebird/firebird-cygwin-msvc.patch.1
index 5e2368b..b563a10 100644
--- a/external/firebird/firebird-cygwin-msvc.patch.1
+++ b/external/firebird/firebird-cygwin-msvc.patch.1
@@ -790,5 +790,5 @@ unchanged:
  
  $(GEN_ROOT)/%.res: $(SRC_ROOT)/%.rc
 -	windres --output-format=coff --include-dir=$(<D) $< $@
-+	windres --output-format=coff --include-dir=$(<D) --target=pe-i386 $< $@
++	rc.exe $(SOLARINC) /fo $@ $<
 only in patch2: