2015-12-15 23:48 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* config/dos/watcom.mk
  * config/win/watcom.mk
  * config/linux/watcom.mk
    ! enabled -bd OpenWatcom switch for code compiled as part of dynamic
      libraries
    * use CauseWay as default DOS extender for dynamic DOS builds

  * config/dyn.mk
  * config/lib.mk
  * src/Makefile
    ! fixed list of libraries used to create Harbour DLL in DOS builds

  * config/bin.mk
  * src/vm/Makefile
    * create hbmainstd library for OpenWatcom DOS shared builds

  * src/vm/maindllh.c
    + added DLL entry function for CauseWay DLLs in OpenWatcom builds

  * src/vm/main.c
    * include maindllh.c in OpenWatcom DOS shared builds

  * utils/hbmk2/hbmk2.prg
    + added support for dynamic binaries in DOS OpenWatcom builds.
      Support for CauseWay DLLs is still broken in current OpenWatcom
      builds so it will have to wait for the fix to be usable.

  * src/vm/dynlibhb.c
    + added support for dynamic libraries to OpenWatcom DOS builds.
      Now it's enabled only in harbour.dll due to problems with
      CW and current OW.

  * src/3rd/zlib/zconf.h
  * src/3rd/zlib/zlib.dif
    * use OS2 patch for exporting ZLIB symbols also in DOS builds

  * src/rdd/dbf1.c
    * pacified warning

config/bin.mk

@@ -37,6 +37,10 @@ ifeq ($(BUILD_SHARED),yes)
       else
          HB_LIBS_TPL += hbmainstd
       endif
+   else
+   ifeq ($(HB_PLATFORM)-$(HB_COMPILER),dos-watcom)
+      HB_LDFLAGS += FILE $(LIB_DIR)/hbmainstd.lib
+   endif
    endif
    endif
    endif

config/dos/watcom.mk

@@ -54,7 +54,11 @@ endif
 
 # different SYS values: dos4g (default), pmodew (commercial), causeway,
 # dos32a (DOS/32A LE executable), dos32x (DOS/32A LX executable)
-LDFLAGS += SYS dos32a
+ifeq ($(HB_BUILD_DYN),dostest)
+   LDFLAGS += SYS causeway
+else
+   LDFLAGS += SYS dos32a
+endif
 
 LDLIBS := $(HB_USER_LIBS)
 LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
@@ -73,12 +77,17 @@ endif
 
 ifeq ($(HB_BUILD_DYN),dostest)
 
+   HB_DYN_COPT := -DHB_DYNLIB -bd
+
    DY := $(LD)
    DFLAGS += OP quiet SYS cwdllr
    DY_OUT :=
    DLIBS := $(foreach lib,$(HB_USER_LIBS),$(lib))
    DLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
    DLIBS += $(foreach lib,$(SYSLIBS),$(lib))
+   ifneq ($(HB_HAS_WATT),)
+      DLIBS += $(HB_LIB_WATT)/wattcpwf
+   endif
    DLIBS := $(strip $(DLIBS))
 
    ifneq ($(DLIBS),)

config/dyn.mk

@@ -52,6 +52,7 @@ HB_DYN_LIBS := \
    gtgui \
    gtwin \
    gtos2 \
+   gtdos \
    gttrm \
    gtcrs \
    gtsln \
@@ -65,17 +66,13 @@ endif
 ifneq ($(HB_HAS_ZLIB_LOCAL),)
    HB_DYN_LIBS += hbzlib
 endif
+ifeq ($(HB_PLATFORM),dos)
+   HB_DYN_LIBS += hbpmcom
+endif
 
 #   hbcplr \
 #   hbdebug \
 
-ifneq ($(HB_HAS_PCRE_LOCAL),)
-   HB_DYN_LIBS += hbpcre
-endif
-ifneq ($(HB_HAS_ZLIB_LOCAL),)
-   HB_DYN_LIBS += hbzlib
-endif
-
 
 DYN_FILE :=
 IMP_FILE :=

config/lib.mk

@@ -26,6 +26,7 @@ HB_DYN_LIBS := \
    gtgui \
    gtwin \
    gtos2 \
+   gtdos \
    gttrm \
    gtcrs \
    gtsln \
@@ -40,6 +41,9 @@ endif
 ifneq ($(HB_HAS_ZLIB_LOCAL),)
    HB_DYN_LIBS += hbzlib
 endif
+ifeq ($(HB_PLATFORM),dos)
+   HB_DYN_LIBS += hbpmcom
+endif
 
 # Added only for hbpp
 -include $(TOP)$(ROOT)config/$(HB_PLATFORM)/libs.mk

config/linux/watcom.mk

@@ -55,6 +55,8 @@ LDFLAGS += SYS linux
 LDLIBS := $(HB_USER_LIBS)
 LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
 
+#HB_DYN_COPT := -DHB_DYNLIB -bd
+#
 #DY := $(LD)
 #DFLAGS += OP quiet FORM elf dll LIBPATH $(WATCOM)/lib386 LIBPATH $(WATCOM)/lib386/linux OP exportall
 #DY_OUT :=

config/win/watcom.mk

@@ -2,7 +2,7 @@ OBJ_EXT := .obj
 LIB_PREF :=
 LIB_EXT := .lib
 
-HB_DYN_COPT := -DHB_DYNLIB
+HB_DYN_COPT := -DHB_DYNLIB -bd
 
 ifeq ($(HB_BUILD_MODE),cpp)
    CC := wpp386