From 613ece5a14e2ce34c745e81eabab02ad0a4e50e7 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 21 Dec 2009 15:14:12 +0000
Subject: [PATCH] 2009-12-21 16:13 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     + Enabled -shared support for
 dos/djgpp. Not tested.     + Enabled -hbdyn support for dos/djgpp. Blind
 coding, not tested.

  * ChangeLog
    + TODOs/TOFIXes marked as done.
---
 harbour/ChangeLog             | 17 +++++++++++++----
 harbour/utils/hbmk2/hbmk2.prg | 18 ++++++++++++++++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 46c03f140f..9df5ee5f62 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-21 16:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Enabled -shared support for dos/djgpp. Not tested.
+    + Enabled -hbdyn support for dos/djgpp. Blind coding, not tested.
+
+  * ChangeLog
+    + TODOs/TOFIXes marked as done.
+
 2009-12-21 15:46 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/vm/Makefile
     * enable HB_HVM_ALL=yes in OpenWatcom C builds - it does not cause such
@@ -1693,7 +1701,7 @@
              the cleanest way?
              (for now I kept a cast, assuming that a buffer is
              created by Harbour conversion API, but that's not
-             something it guarantees in the future.)
+             something it guarantees in the future.) [DONE]
 
 2009-12-11 04:37 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/vm/thread.c
@@ -2666,9 +2674,9 @@
       to guarantee its present. Anyhow current method is still not
       safe.
     % Cleaned some casts.
-    ; TOFIX: mutex initialization in MyMainWindow.
+    ; TOFIX: mutex initialization in MyMainWindow. [DONE]
     ; TOFIX: MyMainWindow is a leakable resource and it _is_
-             leaked from hbxbp.
+             leaked from hbxbp. [DONE]
 
   * contrib/hbxbp/xbpsle.prg
   * contrib/hbxbp/xbplistbox.prg
@@ -2695,7 +2703,7 @@
       it's still not safe and should be solved differently.
       (TOFIX)
     ; TOFIX: hbxbp_SetEventFilter() is passed to several function,
-             but this function has no return value.
+             but this function has no return value. [DONE]
 
   * contrib/hbcairo/core.c
     * Minor.
@@ -2717,6 +2725,7 @@
     ! Fixed to check for NULL pointer and return error in
       QT_CONNECT_EVENT() and QT_DISCONNECT_EVENT() and MyMainWindow desctructor.
     ; TOFIX: Passing non-block to QT_MYMAINWINDOW() first parameter will cause GPFs.
+             [MIS-REPORT]
 
   * contrib/hbxbp/tests/demoxbp.prg
   * contrib/hbxbp/xbpwindow.prg
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 0f579d5701..e89c773eed 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1000,7 +1000,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
       l_aLIBHBGT := { "gtdos" }
       hbmk[ _HBMK_cGTDEFAULT ] := "gtdos"
       cDynLibNamePrefix := ""
-      cDynLibExt := ""
+      cDynLibExt := "" /* NOTE: This will be reset later if djgpp is detected. */
       cBinExt := ".exe"
       cOptPrefix := "-/"
    CASE hbmk[ _HBMK_cPLAT ] == "os2"
@@ -1346,6 +1346,12 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
       ENDIF
    ENDCASE
 
+   /* Tweaks to compiler setup */
+
+   IF hbmk[ _HBMK_cCOMP ] == "djgpp"
+      cDynLibExt := ".dxe"
+   ENDIF
+
    /* Finish detecting bin/lib/include dirs */
 
    IF Empty( l_cHB_BIN_INSTALL )
@@ -2651,6 +2657,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ELSE
             cOpt_CompC += " {LC}"
          ENDIF
+         cBin_Dyn := "dxe3gen"
+         cOpt_Dyn := "--whole-archive {FD} -o {OD} {DL} {LO} {LL} {LB} {LS}"
          cBin_Link := cBin_CompC
          cOpt_Link := "{LO} {LA} {FL} {DL}{SCRIPT}"
          cLibPathPrefix := "-L"
@@ -2667,6 +2675,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          IF hbmk[ _HBMK_lMAP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map,{OM}" )
          ENDIF
+         IF hbmk[ _HBMK_lIMPLIB ]
+            AAdd( hbmk[ _HBMK_aOPTD ], "-Y {OI}" )
+         ENDIF
          IF ! hbmk[ _HBMK_lSHARED ]
             l_aLIBSYS := ArrayJoin( l_aLIBSYS, { "m" } )
          ENDIF
@@ -2691,6 +2702,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             AAdd( l_aLIBSYS, "pdcurses" )
          ENDIF
 
+         l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourm" + cDL_Version_Alter + cLibExt,;
+                                                   "harbour" + cDL_Version_Alter + cLibExt ) }
+
          IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
             cBin_Lib   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib, nCmd_Esc )
             cBin_CompC := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC, nCmd_Esc )
@@ -3708,7 +3722,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                         hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB
                         cFile += '   s_defaultGT = "' + Upper( SubStr( hbmk[ _HBMK_cGT ], 3 ) ) + '";'           + Chr( 10 )
                      ELSE
-                        cFile += '   hb_vmSetDefaultGT( "' + Upper( SubStr( hbmk[ _HBMK_cGT ], 3 ) ) + '" );'      + Chr( 10 )
+                        cFile += '   hb_vmSetDefaultGT( "' + Upper( SubStr( hbmk[ _HBMK_cGT ], 3 ) ) + '" );'    + Chr( 10 )
                      ENDIF
                   ENDIF
                   IF l_cMAIN != NIL