From a61de422bb1f83279dc1899e858764c7e3a0c2dc Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 7 Aug 2009 01:10:11 +0000
Subject: [PATCH] 2009-08-07 03:08 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     + Added support for windres resource
 compiler for os2/gcc.       (untested)     + Minor step to support os2/gcc
 cross-compilation on Linux.

---
 harbour/ChangeLog             |  6 ++++++
 harbour/utils/hbmk2/hbmk2.prg | 13 +++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2c3ad7f713..500ca13374 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-07 03:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added support for windres resource compiler for os2/gcc.
+      (untested)
+    + Minor step to support os2/gcc cross-compilation on Linux.
+
 2009-08-07 02:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed to ignore filtered -gt switches (like -gtxwc{unix})
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 567b90078a..5fafc2d5e7 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1826,8 +1826,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
 
          cParam := ArchCompFilter( hbmk, cParam )
          IF ! Empty( cParam )
-            IF hbmk[ _HBMK_cCOMP ] $ "mingw|mingw64|mingwarm"
-               /* For MinGW family add .res files as source input, as they
+            IF hbmk[ _HBMK_cCOMP ] $ "mingw|mingw64|mingwarm" .OR. ;
+               ( hbmk[ _HBMK_cARCH ] == "os2" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" )
+               /* For MinGW/EMX GCC family add .res files as source input, as they
                   will need to be converted to coff format with windres (just
                   like plain .rc files) before feeding them to gcc. */
                FOR EACH cParam IN FN_Expand( PathProc( cParam, aParam[ _PAR_cFileName ] ), Empty( aParam[ _PAR_cFileName ] ) )
@@ -2338,7 +2339,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          cLibPrefix := "-l"
          cLibExt := ""
          cObjExt := ".o"
-         cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "g++.exe", "gcc.exe" )
+         cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "g++", "gcc" ) + cCCEXT
          cOpt_CompC := "-c"
          IF hbmk[ _HBMK_lOPTIM ]
             cOpt_CompC += " -O3"
@@ -2354,7 +2355,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          cLibPathPrefix := "-L"
          cLibPathSep := " "
          cLibLibExt := ".a"
-         cBin_Lib := "ar.exe"
+         cBin_Lib := "ar" + cCCEXT
          cOpt_Lib := "{FA} rcs {OL} {LO}"
          IF hbmk[ _HBMK_lMAP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map,{OM}" )
@@ -2379,6 +2380,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             AAdd( hbmk[ _HBMK_aOPTL ], "-o {OE}" )
          ENDIF
 
+         cBin_Res := "windres" + cCCEXT
+         cResExt := ".reso"
+         cOpt_Res := "{FR} {IR} -O coff -o {OS}"
+
       CASE hbmk[ _HBMK_cARCH ] == "dos" .AND. hbmk[ _HBMK_cCOMP ] == "djgpp"
 
          IF hbmk[ _HBMK_lDEBUG ]