From f1045db35bfae6ba843f3175aadfe12e4c6f4cec Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 23 Sep 2008 23:38:08 +0000 Subject: [PATCH] 2008-09-24 01:37 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/gtsys.c * Added HB_WINCE with GTWVT to the set of defaults. * config/darwin/global.cf * config/hpux/global.cf * config/linux/global.cf * config/sunos/global.cf * config/bsd/global.cf % Removed unnecessary defaulting to GTSTD. * config/os2/gcc.cf ! Fixed minor typo in line 24 / HB_OS2_NEW_TCP. --- harbour/ChangeLog | 14 ++++++++++++++ harbour/bin/bld.bat | 12 ++++++++++-- harbour/bin/bld_os2.cmd | 8 ++++++++ harbour/config/bsd/global.cf | 4 ---- harbour/config/darwin/global.cf | 4 ---- harbour/config/hpux/global.cf | 4 ---- harbour/config/linux/global.cf | 4 ---- harbour/config/os2/gcc.cf | 2 +- harbour/config/sunos/global.cf | 4 ---- harbour/source/rtl/gtsys.c | 2 ++ 10 files changed, 35 insertions(+), 23 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3a1ce149d6..e8d8dff0f9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-24 01:37 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/gtsys.c + * Added HB_WINCE with GTWVT to the set of defaults. + + * config/darwin/global.cf + * config/hpux/global.cf + * config/linux/global.cf + * config/sunos/global.cf + * config/bsd/global.cf + % Removed unnecessary defaulting to GTSTD. + + * config/os2/gcc.cf + ! Fixed minor typo in line 24 / HB_OS2_NEW_TCP. + 2008-09-23 16:19 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/hbwhat + /tests diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index cdead2fc79..1acb429fe9 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -3,6 +3,14 @@ rem rem $Id$ rem +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + rem --------------------------------------------------------------- rem Template to build a final Harbour executable, using Harbour rem with the C code generation feature, then calling the proper C @@ -144,8 +152,8 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include echo LIB rddntx.lib >> build.tmp echo LIB rddcdx.lib >> build.tmp echo LIB rddfpt.lib >> build.tmp - echo LIB hbhsx.lib >> build.tmp - echo LIB hbsix.lib >> build.tmp + echo LIB hbhsx.lib >> build.tmp + echo LIB hbsix.lib >> build.tmp echo LIB hbcommon.lib >> build.tmp echo LIB hbpcre.lib >> build.tmp echo LIB hbzlib.lib >> build.tmp diff --git a/harbour/bin/bld_os2.cmd b/harbour/bin/bld_os2.cmd index 3958fd5980..0b078f8159 100644 --- a/harbour/bin/bld_os2.cmd +++ b/harbour/bin/bld_os2.cmd @@ -3,6 +3,14 @@ rem rem $Id$ rem +rem --------------------------------------------------------------- +rem This is a generic template file, if it doesn't fit your own needs +rem please DON'T MODIFY IT. +rem +rem Instead, make a local copy and modify that one, or make a call to +rem this batch file from your customized one. [vszakats] +rem --------------------------------------------------------------- + rem --------------------------------------------------------------- rem Template to build a final Harbour executable, using Harbour rem with the C code generation feature, then calling the proper C diff --git a/harbour/config/bsd/global.cf b/harbour/config/bsd/global.cf index 347a482396..b45c989bcd 100644 --- a/harbour/config/bsd/global.cf +++ b/harbour/config/bsd/global.cf @@ -27,10 +27,6 @@ endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) -ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtstd -endif - MAKE = gmake ARCH_DIR = $(HB_ARCH) diff --git a/harbour/config/darwin/global.cf b/harbour/config/darwin/global.cf index 8142d3a16b..c7ca9978cf 100644 --- a/harbour/config/darwin/global.cf +++ b/harbour/config/darwin/global.cf @@ -27,10 +27,6 @@ endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) -ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtstd -endif - ARCH_DIR = $(HB_ARCH) MK = $(MAKE) RM = rm -f diff --git a/harbour/config/hpux/global.cf b/harbour/config/hpux/global.cf index 09cecb06ad..84b1b7b2a5 100644 --- a/harbour/config/hpux/global.cf +++ b/harbour/config/hpux/global.cf @@ -27,10 +27,6 @@ endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) -ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtstd -endif - ARCH_DIR = $(HB_ARCH) MK = $(MAKE) RM = rm -f diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf index 8142d3a16b..c7ca9978cf 100644 --- a/harbour/config/linux/global.cf +++ b/harbour/config/linux/global.cf @@ -27,10 +27,6 @@ endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) -ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtstd -endif - ARCH_DIR = $(HB_ARCH) MK = $(MAKE) RM = rm -f diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 1752e775f2..5bcf36929b 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -21,7 +21,7 @@ CFLAGS = -W -Wall -O2 # can be removed if compiled on a tcp/ip stack >= 4.1 (eComStation, # for example), if you do not need it please use HB_OS2_NEW_TCP=yes # environment variable. -ifneq($(HB_OS2_NEW_TCP),yes) +ifneq ($(HB_OS2_NEW_TCP),yes) CFLAGS += -DTCPV40HDRS endif diff --git a/harbour/config/sunos/global.cf b/harbour/config/sunos/global.cf index 09cecb06ad..84b1b7b2a5 100644 --- a/harbour/config/sunos/global.cf +++ b/harbour/config/sunos/global.cf @@ -27,10 +27,6 @@ endif # verify if GT drivers exist HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),)) -ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtstd -endif - ARCH_DIR = $(HB_ARCH) MK = $(MAKE) RM = rm -f diff --git a/harbour/source/rtl/gtsys.c b/harbour/source/rtl/gtsys.c index 8cb28257c7..6653049b3f 100644 --- a/harbour/source/rtl/gtsys.c +++ b/harbour/source/rtl/gtsys.c @@ -63,6 +63,8 @@ HB_GT_REQUEST( HB_GT_DEFAULT ) #elif defined(HB_GT_LIB) HB_GT_REQUEST( HB_GT_LIB ) +#elif defined(HB_WINCE) + HB_GT_REQUEST( WVT ) #elif defined(HB_OS_WIN_32) HB_GT_REQUEST( WIN ) #elif defined(HB_OS_DOS)