From 662007fa1c39951c269ff50d65dd7b4a97cbae3e Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 31 Mar 2009 00:39:37 +0000
Subject: [PATCH] 2009-03-31 02:46 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/config/dos/owatcom.cf   *
 harbour/config/win/owatcom.cf   * harbour/config/linux/owatcom.cf   *
 harbour/config/os2/owatcom.cf   * harbour/utils/hbmk2/hbmk2.prg     * removed
 unnecessary linker options     * use 'SYS causeway' to enable causeway stub
 in DOS builds instead       of setting it manually. DOS users can also use
 DOS4G (default) or       PMODE (commercial) stubs.

---
 harbour/ChangeLog               | 11 +++++++++++
 harbour/config/dos/owatcom.cf   |  3 ++-
 harbour/config/linux/owatcom.cf |  2 +-
 harbour/config/os2/owatcom.cf   |  2 +-
 harbour/config/win/owatcom.cf   |  2 +-
 harbour/utils/hbmk2/hbmk2.prg   |  8 ++++----
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f978b50754..93d0a07ee5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-31 02:46 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/dos/owatcom.cf
+  * harbour/config/win/owatcom.cf
+  * harbour/config/linux/owatcom.cf
+  * harbour/config/os2/owatcom.cf
+  * harbour/utils/hbmk2/hbmk2.prg
+    * removed unnecessary linker options
+    * use 'SYS causeway' to enable causeway stub in DOS builds instead
+      of setting it manually. DOS users can also use DOS4G (default) or
+      PMODE (commercial) stubs.
+
 2009-03-31 01:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * external/libhpdf/Makefile
   * external/libpng/Makefile
diff --git a/harbour/config/dos/owatcom.cf b/harbour/config/dos/owatcom.cf
index d1051409b8..67be3c9041 100644
--- a/harbour/config/dos/owatcom.cf
+++ b/harbour/config/dos/owatcom.cf
@@ -97,7 +97,8 @@ $(foreach lib, $(GTLIBS), $(link_lib))
 endef
 
 LD = wlink
-LDFLAGS = OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe
+# other SYS values: dos4g (default), pmodew (commercial)
+LDFLAGS = SYS causeway
 ifeq ($(HB_BUILD_DEBUG),yes)
 LDFLAGS := debug all $(LDFLAGS)
 endif
diff --git a/harbour/config/linux/owatcom.cf b/harbour/config/linux/owatcom.cf
index 626dff7088..33313a91bf 100644
--- a/harbour/config/linux/owatcom.cf
+++ b/harbour/config/linux/owatcom.cf
@@ -66,7 +66,7 @@ space:= $(empty) $(empty)
 comma:= ,
 
 LD = wlink
-LDFLAGS = sys Linux OP CASEEXACT
+LDFLAGS = sys Linux
 ifeq ($(HB_BUILD_DEBUG),yes)
 LDFLAGS := debug all $(LDFLAGS)
 endif
diff --git a/harbour/config/os2/owatcom.cf b/harbour/config/os2/owatcom.cf
index 4cfd628230..19c2bc45ab 100644
--- a/harbour/config/os2/owatcom.cf
+++ b/harbour/config/os2/owatcom.cf
@@ -83,7 +83,7 @@ echo @%WATCOM%/binp/wlink.lnk >> __link__.tmp
 endef
 
 LD = wlink
-LDFLAGS = OP stack=65536 OP CASEEXACT
+LDFLAGS =
 ifeq ($(HB_BUILD_DEBUG),yes)
 LDFLAGS := debug all $(LDFLAGS)
 endif
diff --git a/harbour/config/win/owatcom.cf b/harbour/config/win/owatcom.cf
index bb1b878989..3047c87241 100644
--- a/harbour/config/win/owatcom.cf
+++ b/harbour/config/win/owatcom.cf
@@ -90,7 +90,7 @@ echo LIB kernel32.lib, user32.lib, ws2_32.lib >> __link__.tmp
 endef
 
 LD = wlink
-LDFLAGS = OP osn=NT OP CASEEXACT
+LDFLAGS =
 ifeq ($(HB_BUILD_DEBUG),yes)
 LDFLAGS := debug all $(LDFLAGS)
 endif
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b1b4a5abf2..c43a0502bb 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1478,7 +1478,7 @@ FUNCTION Main( ... )
          cBin_CompC := "wpp386.exe"
          cOpt_CompC := "-zq -w3 -5r -fp5 -onaehtri+ -s -ei -zp4 -zt0 -bt=DOS {FC} -i{DI} {LC}"
          cBin_Link := "wlink.exe"
-         cOpt_Link := "OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe {FL} NAME {OE} {LO} {DL} {LL}{SCRIPT}"
+         cOpt_Link := "SYS causeway {FL} NAME {OE} {LO} {DL} {LL}{SCRIPT}"
          cBin_Lib := "wlib.exe"
          cOpt_Lib := "{FA} {OL} {LO}{SCRIPT}"
          cLibLibExt := cLibExt
@@ -1500,7 +1500,7 @@ FUNCTION Main( ... )
          cBin_CompC := "wpp386.exe"
          cOpt_CompC := "-zq -w3 -5r -fp5 -onaehtri+ -s -ei -zp4 -zt0 -bt=NT {FC} -i{DI} {LC}"
          cBin_Link := "wlink.exe"
-         cOpt_Link := "OP osn=NT OP CASEEXACT {FL} NAME {OE} {LO} {DL} {LL} {LS}{SCRIPT}"
+         cOpt_Link := "{FL} NAME {OE} {LO} {DL} {LL} {LS}{SCRIPT}"
          cBin_Lib := "wlib.exe"
          cOpt_Lib := "{FA} {OL} {LO}{SCRIPT}"
          cLibLibExt := cLibExt
@@ -1554,7 +1554,7 @@ FUNCTION Main( ... )
          cBin_CompC := "wpp386.exe"
          cOpt_CompC := "-zq -w3 -5r -fp5 -onaehtri+ -s -ei -zp4 -zt0 -bt=OS2 {FC} -i{DI} {LC}"
          cBin_Link := "wlink.exe"
-         cOpt_Link := "OP stack=65536 OP CASEEXACT {FL} NAME {OE} {LO} {DL} {LL}{SCRIPT}"
+         cOpt_Link := "{FL} NAME {OE} {LO} {DL} {LL}{SCRIPT}"
          cBin_Lib := "wlib.exe"
          cOpt_Lib := "{FA} {OL} {LO}{SCRIPT}"
          cLibLibExt := cLibExt
@@ -1583,7 +1583,7 @@ FUNCTION Main( ... )
          cBin_CompC := "wpp386"
          cOpt_CompC := "-zq -w3 -6r -fp6 -onaehtri+ -s -ei -zp4 -zt0 -bt=LINUX {FC} -i{DI} {LC}"
          cBin_Link := "wlink"
-         cOpt_Link := "SYS LINUX OP CASEEXACT {FL} NAME {OE} {LO} {DL} {LL}{SCRIPT}"
+         cOpt_Link := "SYS LINUX {FL} NAME {OE} {LO} {DL} {LL}{SCRIPT}"
          cBin_Lib := "wlib"
          cOpt_Lib := "{FA} {OL} {LO}{SCRIPT}"
          cLibLibExt := cLibExt