From 3f1f0600c6cd2000fdfc404f59804fd754af4b7e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 15 Nov 2009 02:52:43 +0000
Subject: [PATCH] 2009-11-15 03:50 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * config/win/bcc.mk     + Changed to use ilink32 directly to
 link executables instead of       relying on bcc32.       This changed synced
 this details with hbmk2.       Please test, especially on Linux+Wine.      
 Also please don't hesitate to make adjustments to this change       if
 needed. BCC isn't my bread and butter and I didn't make       extensive
 tests.

---
 harbour/ChangeLog         | 12 +++++++++++-
 harbour/config/win/bcc.mk | 13 ++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b1c831158e..cae921ad81 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-15 03:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/win/bcc.mk
+    + Changed to use ilink32 directly to link executables instead of 
+      relying on bcc32.
+      This changed synced this details with hbmk2.
+      Please test, especially on Linux+Wine.
+      Also please don't hesitate to make adjustments to this change 
+      if needed. BCC isn't my bread and butter and I didn't make 
+      extensive tests.
+
 2009-11-14 23:16 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbqt.ch
   * contrib/hbqt/tests/demoqt.prg
@@ -622,7 +632,7 @@
   + codepage/cpno865.c
   + codepage/cppt860.c
     + Added CPs generated via cpinfo.prg from ntx*.obj (C5.2e).
-      For these language, I've only 'guessed' the CP assigment:
+      For these languages, I've only 'guessed' the CP assigment:
           cpdk865
           cpfi850
           cpnl850
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index b297a1c75c..606ae5776f 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -42,13 +42,14 @@ endif
 # Hack to autoconfig bcc, and not require properly set .cfg files in its bin dir.
 # It only works if compiler autodetection is being used.
 ifneq ($(HB_COMP_PATH_PUB),)
-   HB_CFLAGS += $(subst \,/,-I"$(HB_COMP_PATH_PUB)../Include")
-   LDFLAGS   += $(subst \,/,-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
-   DFLAGS    += $(subst \,/,-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
+   HB_CFLAGS += $(subst /,$(DIRSEP),-I"$(HB_COMP_PATH_PUB)../Include")
+   LDFLAGS   += $(subst /,$(DIRSEP),-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
+   DFLAGS    += $(subst /,$(DIRSEP),-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
 endif
 
-LD := bcc32.exe
-LD_OUT := -e
+LD := ilink32.exe
+LDFLAGS += -Gn -Tpe $(LIBPATHS)
+LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) c0x32.obj $(^F), $(subst /,$(DIRSEP),$(BIN_DIR)/$@), nul, $(subst /,$(DIRSEP),$(LDLIBS)) cw32mt.lib import32.lib $(LDSTRIP)
 
 LIBPATHS := -L$(LIB_DIR)
 # It's probably not necessary in native Windows but I need it
@@ -56,8 +57,6 @@ LIBPATHS := -L$(LIB_DIR)
 LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
 LDLIBS += $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT))
 
-LDFLAGS += $(LIBPATHS)
-
 AR := tlib.exe
 ARFLAGS := /P128
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(foreach file,$(?F),-+$(file))