diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index ce91b773b2..a43e4c35df 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,16 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-12-03 15:17 UTC+0100 Viktor Szakats (harbour syenar.net) + * config/global.mk + * README.txt + + enabled dynlib generation by default on the Windows + platform. It means that hbrun will be built in shared + mode, so it can load them. You can copy hbmk2 to the name + 'hbrun' and get a static built hbrun, or build it using + its .hbp file to your own needs. If you feel offended + anyways, turn off dyn contribs as described in README.txt + 2012-12-03 13:03 UTC+0100 Viktor Szakats (harbour syenar.net) * (whole trunk repo) * COPYING -> COPYING.txt diff --git a/harbour/README.txt b/harbour/README.txt index f560e7d859..cff30ad9ba 100644 --- a/harbour/README.txt +++ b/harbour/README.txt @@ -736,7 +736,8 @@ TABLE OF CONTENT - HB_BUILD_PKG=yes Create release package. Default: no Requires 'clean install' in root source dir. - HB_BUILD_DYN=no Create Harbour dynamic libraries. Default: yes - - HB_BUILD_CONTRIB_DYN=yes Create contrib dynamic libraries. Default: no + - HB_BUILD_CONTRIB_DYN=yes Create contrib dynamic libraries. Default: no, + except Windows platform, where it's yes. - HB_BUILD_SHARED=yes Create Harbour executables in shared mode. Default: yes when HB_INSTALL_PREFIX points to a *nix system location, otherwise no. diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 1a8e36b9de..8cc8e1a323 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -146,7 +146,6 @@ ifeq ($(HB_INIT_DONE),) # Enforce some basic settings for release packages export HB_BUILD_DYN := yes - export HB_BUILD_CONTRIB_DYN := yes export HB_BUILD_OPTIM := yes export HB_BUILD_DEBUG := no export HB_BUILD_SHARED := no @@ -392,6 +391,12 @@ ifeq ($(HB_HOST_PLAT),) endif endif +ifneq ($(filter $(HB_HOST_PLAT),win),) + ifeq ($(HB_BUILD_CONTRIB_DYN),) + export HB_BUILD_CONTRIB_DYN := yes + endif +endif + ifneq ($(filter $(HB_HOST_PLAT),win wce dos os2),) HB_HOST_BIN_EXT := .exe else