From 977cffcf00f1ad3597161e318fd155eb1e5e166a Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 20 May 2010 21:35:20 +0000
Subject: [PATCH] 2010-05-20 23:34 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     ! Fixed overlook in recent
 modification (put .def file macros       in normal linker command template)  
   ! Fixed missing '-nologo' option in msvc -hbdyn[vm] linker       command
 template.

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

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 11b4e8607a..37f1e07b6e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-20 23:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed overlook in recent modification (put .def file macros
+      in normal linker command template)
+    ! Fixed missing '-nologo' option in msvc -hbdyn[vm] linker
+      command template.
+
 2010-05-20 23:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed filter evaluation to not let envvar names colliding
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index c4522207d9..363491829d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3334,7 +3334,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          cBin_CompCPP := cBin_CompC
          nCmd_Esc := _ESC_DBLQUOTE
          cOpt_Lib := "-nologo {FA} -out:{OL} {LO}"
-         cOpt_Dyn := "{FD} {IM} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}"
+         cOpt_Dyn := "-nologo {FD} {IM} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}"
          cOpt_CompC := "-nologo -c"
          IF hbmk[ _HBMK_lOPTIM ]
             IF hbmk[ _HBMK_cPLAT ] == "wce"
@@ -3385,7 +3385,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          ENDIF
          cOpt_CompC += " {FC} {LC}"
          cOptIncMask := "-I{DI}"
-         cOpt_Link := "-nologo -out:{OE} {LO} {DL} {FL} {IM} {LL} {LB} {LS}"
+         cOpt_Link := "-nologo -out:{OE} {LO} {DL} {FL} {LL} {LB} {LS}"
          SWITCH hbmk[ _HBMK_cCOMP ]
          CASE "msvc"     ; AAdd( hbmk[ _HBMK_aOPTI ], "-machine:x86"  ) ; EXIT
          CASE "msvc64"   ; AAdd( hbmk[ _HBMK_aOPTI ], "-machine:x64"  ) ; EXIT
@@ -3544,7 +3544,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          IF hbmk[ _HBMK_lMT ]
             AAdd( hbmk[ _HBMK_aOPTC ], "-MT" )
          ENDIF
-         cOpt_Link := "-out:{OE} {LO} {DL} {FL} {IM} {LL} {LB} {LS}"
+         cOpt_Link := "-out:{OE} {LO} {DL} {FL} {LL} {LB} {LS}"
          cLibPathPrefix := "-libpath:"
          cLibPathSep := " "
          cDynDefPrefix := "-def:"