From dbf32224f9565cf106acc549d9c95d304988483a Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Mon, 21 Jan 2002 22:10:36 +0000 Subject: [PATCH] See ChangeLog entry 2002-01-21 17:00 UTC-0500 David G. Holm --- harbour/ChangeLog | 12 ++++++++++++ harbour/config/dos/bcc16.cf | 12 ++++++------ harbour/contrib/libgt/make_b32.bat | 2 +- harbour/contrib/libgt/make_vc.bat | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 57adf34bd8..522cee7afa 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,18 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ +2002-01-22 10:37 UTC+0100 Antonio Linares + * source/vm/hvm.c + * Fixed a minor error on hb_vmPopDate() caused by yesterday changes + +2002-01-22 10:20 UTC+0300 Alexander Kresin + * source/rdd/dbfntx/dbfntx1.c + * bug fixed, reported by Jorge A. Giraldo + +2002-01-21 00:19 UTC+0100 Maurilio Longo + * include/hbstack.h + ! fixed a few errors inside macro definition of stack operations + -DHB_STACK_MACROS defined ed diff --git a/harbour/config/dos/bcc16.cf b/harbour/config/dos/bcc16.cf index bc82c517b6..072e389c1c 100644 --- a/harbour/config/dos/bcc16.cf +++ b/harbour/config/dos/bcc16.cf @@ -25,7 +25,7 @@ CC = bcc CC_IN = -c CC_OUT = -o CPPFLAGS = -I$($(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP) -I$(_HB_INC_COMPILE) -CFLAGS = -O2 -mh -d +CFLAGS = -i48 -O2 -mh -d #Note: The empty line below HAVE TO exist! define link_file @@ -42,16 +42,16 @@ $(foreach file, $(LINKLIBS), $(link_file)) endef LD = bcc -LDFLAGS = -O2 -mh $(L_USR) +LDFLAGS = -i48 -O2 -mh $(L_USR) ifeq ($(HB_LIB_COMPILE),) -LINKLIBS = $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(ARCH)/$(subst lib,,$(lib))$(LIB_EXT)) -LINKLIBS = $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(ARCH)/$(lib)$(LIB_EXT)) +LINKLIBS += $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(ARCH)/$(subst lib,,$(lib))$(LIB_EXT)) +LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(ARCH)/$(lib)$(LIB_EXT)) ifeq ($(findstring rdd,$(LIBS)),rdd) LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(lib)/$(ARCH)/$(lib)$(LIB_EXT)) endif else -LINKLIBS = $(foreach lib, $(CONTRIBS), $(lib)$(LIB_EXT)) -LINKLIBS = $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) +LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT)) +LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) ifeq ($(findstring rdd,$(LIBS)),rdd) LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(lib)$(LIB_EXT)) endif diff --git a/harbour/contrib/libgt/make_b32.bat b/harbour/contrib/libgt/make_b32.bat index e79dd03a6d..b72006f1d6 100644 --- a/harbour/contrib/libgt/make_b32.bat +++ b/harbour/contrib/libgt/make_b32.bat @@ -13,7 +13,7 @@ if "%1" == "CLEAN" goto CLEAN :BUILD_OK - copy ..\..\lib\b32\libgt.lib ..\..\lib\*.* > nul + copy ..\..\lib\b32\gt.lib ..\..\lib\*.* > nul goto EXIT :BUILD_ERR diff --git a/harbour/contrib/libgt/make_vc.bat b/harbour/contrib/libgt/make_vc.bat index 868a2a553f..3e7655f017 100644 --- a/harbour/contrib/libgt/make_vc.bat +++ b/harbour/contrib/libgt/make_vc.bat @@ -10,7 +10,7 @@ rem :BUILD_OK - copy ..\..\lib\vc\libgt.lib ..\..\lib\*.* >nul + copy ..\..\lib\vc\gt.lib ..\..\lib\*.* >nul goto EXIT :BUILD_ERR