From f57d43b91305ba3e89dc70db5dbcef8a837d9932 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 5 Oct 2009 11:31:06 +0000
Subject: [PATCH] 2009-10-05 13:28 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * INSTALL     + More details to MS Windows SDK 7.

  * utils/hbmk2/hbmk2.prg
    ! Minor typo in comment.

  * config/win/bcc.mk
    + Added syslibs to dynlib link command. This seems to be needed
      for some newer (6.20) versions of BCC.
      Thanks Przemek for noticing, Mario for reporting.
      And please test, I didn't do it for either BCC versions due
      to lack of time.
---
 harbour/ChangeLog             | 14 ++++++++++++++
 harbour/INSTALL               |  5 +++--
 harbour/config/win/bcc.mk     |  1 +
 harbour/utils/hbmk2/hbmk2.prg |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ec8708ecf5..fe164e6d11 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-05 13:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    + More details to MS Windows SDK 7.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Minor typo in comment.
+
+  * config/win/bcc.mk
+    + Added syslibs to dynlib link command. This seems to be needed 
+      for some newer (6.20) versions of BCC.
+      Thanks Przemek for noticing, Mario for reporting.
+      And please test, I didn't do it for either BCC versions due 
+      to lack of time.
+
 2009-10-05 12:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbsocket.h
   * harbour/source/rtl/hbsocket.c
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 96fcbe2e06..bcc8741eb8 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -1181,12 +1181,13 @@ HARBOUR
          http://www.openwatcom.org/
       XCode [darwin, free, closed-source]
          http://developer.apple.com/TOOLS/Xcode/
+      MS Windows SDK [win, free]:
+         http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx
+         (7.0 contains compilers for x86, x86_64 and IA-64)
       MS Visual Studio Express [win, free, closed-source]
          http://www.microsoft.com/express/
       MS Visual Studio [win, commercial, closed-source]
          http://www.microsoft.com/visualstudio/
-      MS Windows SDK [win, free]:
-         http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx
       MS Windows Mobile SDK [wce, free]:
          http://www.microsoft.com/downloads/details.aspx?familyid=83A52AF2-F524-4EC5-9155-717CBE5D25ED
       Pelles C [win, wce, free, closed-source]
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index 76ca000617..8f50a363cd 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -88,6 +88,7 @@ DY := ilink32.exe
 DFLAGS := -q -Gn -C -aa -Tpd -Gi -x
 DY_OUT :=
 DLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
+DLIBS += $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 5e6a1e3dad..1b9a61ab3c 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -86,7 +86,7 @@
 /* TODO: Create temporary .c files with mangled names, to avoid
          incidentally overwriting existing .c file with the same name.
          Problems to solve: -hbcc compatibility (the feature has to be
-         disabled when this switch is uses). Collision with -o harbour
+         disabled when this switch is used). Collision with -o harbour
          option isn't a problem, since we're overriding it already for
          hbmk2, but we will need to deal with "/" prefixed variant. Since
          we need to use -o Harbour switch, it will be a problem also when