From f16e7857a87432ef8929801f5ae381d700222899 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 5 Sep 2009 17:18:12 +0000 Subject: [PATCH] 2009-09-05 19:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/examples/contribf.hbc * contrib/hbtip/hbtipssl.hbc * contrib/hbtip/hbtip.hbc * contrib/hbtip/Makefile + Enabled hbtip lib for dos platform. It can work with watt lib. --- harbour/ChangeLog | 7 +++++++ harbour/contrib/hbtip/Makefile | 16 +++++----------- harbour/contrib/hbtip/hbtip.hbc | 2 -- harbour/contrib/hbtip/hbtipssl.hbc | 2 -- harbour/utils/hbmk2/examples/contribf.hbc | 4 ++-- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 390217e9db..ef42189119 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-05 19:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/examples/contribf.hbc + * contrib/hbtip/hbtipssl.hbc + * contrib/hbtip/hbtip.hbc + * contrib/hbtip/Makefile + + Enabled hbtip lib for dos platform. It can work with watt lib. + 2009-09-05 16:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Little improvements. diff --git a/harbour/contrib/hbtip/Makefile b/harbour/contrib/hbtip/Makefile index bcb1114bbd..9374b52027 100644 --- a/harbour/contrib/hbtip/Makefile +++ b/harbour/contrib/hbtip/Makefile @@ -35,16 +35,10 @@ PRG_HEADERS := \ thtml.ch \ tip.ch \ -ifneq ($(HB_PLATFORM),dos) +include $(TOP)$(ROOT)config/header.mk +include $(TOP)$(ROOT)config/lib.mk - include $(TOP)$(ROOT)config/header.mk - include $(TOP)$(ROOT)config/lib.mk - - ifneq ($(HB_HAS_OPENSSL),) - DIRS := hbtipssl - include $(TOP)$(ROOT)config/dir.mk - endif - -else - include $(TOP)$(ROOT)config/none.mk +ifneq ($(HB_HAS_OPENSSL),) + DIRS := hbtipssl + include $(TOP)$(ROOT)config/dir.mk endif diff --git a/harbour/contrib/hbtip/hbtip.hbc b/harbour/contrib/hbtip/hbtip.hbc index e3ec39d448..00d14800d9 100644 --- a/harbour/contrib/hbtip/hbtip.hbc +++ b/harbour/contrib/hbtip/hbtip.hbc @@ -2,8 +2,6 @@ # $Id$ # -{dos}skip=yes - incpaths=. libs=hbtip diff --git a/harbour/contrib/hbtip/hbtipssl.hbc b/harbour/contrib/hbtip/hbtipssl.hbc index acee5fb3ae..c04714e245 100644 --- a/harbour/contrib/hbtip/hbtipssl.hbc +++ b/harbour/contrib/hbtip/hbtipssl.hbc @@ -2,8 +2,6 @@ # $Id$ # -{dos}skip=yes - incpaths=. libs=hbtips diff --git a/harbour/utils/hbmk2/examples/contribf.hbc b/harbour/utils/hbmk2/examples/contribf.hbc index d2f469e365..5762ae391f 100644 --- a/harbour/utils/hbmk2/examples/contribf.hbc +++ b/harbour/utils/hbmk2/examples/contribf.hbc @@ -9,11 +9,11 @@ libs=hbbmcdx hbbtree hbclipsm hbcrypt hbct hbgt hbmisc hbmzip hbnf hbtpathy hbvpdf hbziparc rddsql xhb # contribs portable, with external dependencies: -libs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbqt sddfb sddmy sddpg +libs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbqt hbtip sddfb sddmy sddpg # contribs with limited availability (some with external dependencies): {!pocc&!xcc&!dmc&!watcom}libs=gtalleg -{!dos}libs=hbfimage hbssl hbtip +{!dos}libs=hbfimage hbssl {linux|win}libs=rddads {win}libs=gtwvg hbblat hbwin rddado {win&!dmc}libs=hbwhat