From 7d3e6212d3052723855a28bedf5ecaa693cf76b0 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 29 Mar 2010 20:54:13 +0000
Subject: [PATCH] 2010-03-29 22:53 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/os2/gcc.mk     + Readded OS/2 windres call in coff
 mode. Commented the whole       thing with NOTE. Seems like windres bug.     
  I left gccomf branch active, maybe they fixed it in those       more recent
 versions.

---
 harbour/ChangeLog         |  7 +++++++
 harbour/config/os2/gcc.mk | 11 +++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3f6f64ca6e..3238cd39a1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-29 22:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/os2/gcc.mk
+    + Readded OS/2 windres call in coff mode. Commented the whole
+      thing with NOTE. Seems like windres bug.
+      I left gccomf branch active, maybe they fixed it in those
+      more recent versions.
+
 2010-03-29 22:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbthread.h
   * harbour/src/vm/thread.c
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index d2229bb33c..7522cfbe8b 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -39,10 +39,17 @@ ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -g
 endif
 
-RC := $(HB_CCPATH)$(HB_CCPREFIX)windres
-RC_OUT := -o$(subst x,x, )
 ifeq ($(HB_COMPILER),gccomf)
+   RC := $(HB_CCPATH)$(HB_CCPREFIX)windres
+   RC_OUT := -o$(subst x,x, )
    RCFLAGS := -O omf
+else
+   # NOTE: This fails with error below in certain gcc versions, so I commented it for now:
+   #       'windres: can't get BFD_RELOC_RVA relocation type: No such file or directory'
+
+   #RC := $(HB_CCPATH)$(HB_CCPREFIX)windres
+   #RC_OUT := -o$(subst x,x, )
+   #RCFLAGS := -O coff
 endif
 
 ifneq ($(filter $(HB_BUILD_STRIP),all lib),)