From 837190c19c5f2199aba8c2e17a706a0f94430e14 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 14 Apr 2009 13:57:49 +0000
Subject: [PATCH] 2009-04-14 15:57 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * utils/hbmk2/hbmk2.prg     ! Fixed Borland stub for both GUI and CUI
 mode.       This bug surfaced now that a separate link phase is always used. 
    ! Fixed handling of libpaths with '-' chars in them for bcc.

---
 harbour/ChangeLog             | 6 ++++++
 harbour/utils/hbmk2/hbmk2.prg | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 853a26b85c..f12880b41d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-14 15:57 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed Borland stub for both GUI and CUI mode.
+      This bug surfaced now that a separate link phase is always used.
+    ! Fixed handling of libpaths with '-' chars in them for bcc.
+
 2009-04-14 14:29 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     * Changed to put user supplied lib to the beginning of the lib
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index a29fe9a87c..7c90c573a0 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1263,7 +1263,8 @@ PROCEDURE Main( ... )
          s_aPRG_TODO := {}
          FOR EACH tmp IN s_aPRG
             IF s_lDEBUGINC
-               OutStd( "PRG", FN_ExtSet( tmp, ".prg" ), FN_DirExtSet( tmp, cWorkDir, ".c" ), hb_osNewLine() )
+               OutStd( "PRG", FN_ExtSet( tmp, ".prg" ),;
+                              FN_DirExtSet( tmp, cWorkDir, ".c" ), hb_osNewLine() )
             ENDIF
             IF ! hb_FGetDateTime( FN_ExtSet( tmp, ".prg" ), @tmp1 ) .OR. ;
                ! hb_FGetDateTime( FN_DirExtSet( tmp, cWorkDir, ".c" ), @tmp2 ) .OR. ;
@@ -1914,7 +1915,7 @@ PROCEDURE Main( ... )
          cOpt_Res := "{IR} -fo{OS}"
          cResExt := ".res"
          cBin_Link := "ilink32.exe"
-         cOpt_Link := "-Gn -C -ap -Tpe -L{DL} {FL} c0d32.obj {LO}, {OE}, " + iif( s_lMAP, "{OM}", "nul" ) + ", cw32mt.lib {LL} import32.lib,, {LS}{SCRIPT}"
+         cOpt_Link := '-Gn -C -ap -Tpe -L"{DL}" {FL} ' + iif( s_lGUI, "c0w32.obj", "c0x32.obj" ) + ' {LO}, {OE}, ' + iif( s_lMAP, "{OM}", "nul" ) + ", cw32mt.lib {LL} import32.lib,, {LS}{SCRIPT}"
          cLibPathPrefix := ""
          cLibPathSep := ";"
          IF s_lINC
@@ -2396,7 +2397,8 @@ PROCEDURE Main( ... )
             s_aPRG_DONE := {}
             FOR EACH tmp IN s_aPRG
                IF s_lDEBUGINC
-                  OutStd( "CPRG", FN_DirExtSet( tmp, cWorkDir, ".c" ), FN_DirExtSet( tmp, cWorkDir, cObjExt ), hb_osNewLine() )
+                  OutStd( "CPRG", FN_DirExtSet( tmp, cWorkDir, ".c" ),;
+                                  FN_DirExtSet( tmp, cWorkDir, cObjExt ), hb_osNewLine() )
                ENDIF
                IF ! hb_FGetDateTime( FN_DirExtSet( tmp, cWorkDir, ".c" ), @tmp1 ) .OR. ;
                   ! hb_FGetDateTime( FN_DirExtSet( tmp, cWorkDir, cObjExt ), @tmp2 ) .OR. ;