From a9e8d9387bb0d940209ed36143bfc06beddde932 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Mon, 22 Nov 1999 09:49:53 +0000 Subject: [PATCH] *** empty log message *** --- harbour/ChangeLog | 12 ++++++++---- harbour/hbpp.b32 | 3 ++- harbour/makefile.b32 | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index faaff8a7c3..eff423e9e2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +19991122-10:37 GMT+1 Antonio Linares + * makefile.b32 updated + * hbpp.b32 updated + 19991122-19:50 EDT Paul Tucker * makefile.vc + hbstr and hbfsapi @@ -21,7 +25,7 @@ source/compiler/harbour.l source/compiler/harbour.c * Variable renaming, prefixing, scope optimizing. - * Global functions prefixed with + * Global functions prefixed with * Some ints changed to BOOL. ! Non-ANSI comment removed. % stroupper() changed to hb_strupr(), stroupper() removed. @@ -132,19 +136,19 @@ *source/compiler/genhrb.c *source/compiler/genjava.c *source/compiler/genobj32.c - * finished uniform naming scheme hb_comp* + * finished uniform naming scheme hb_comp* * cleared up declarations and visibility of functions and variables *include/hberrors.h * added new warning "Unreachable code' - + *source/debug/debugger.prg * removed one unreachable RETURN statement *source/pp/hbpp.c * all errors reported by the preprocesor are promoted to fatal errors ('F' prefix) - + 19991119-16:59 GMT+1 Antonio Linares * updated makefile.b32 * updated hbpp.b32 diff --git a/harbour/hbpp.b32 b/harbour/hbpp.b32 index 0694e434a7..8258d884ad 100644 --- a/harbour/hbpp.b32 +++ b/harbour/hbpp.b32 @@ -11,11 +11,12 @@ PROJECT: lib\b32\hbpp.lib hbpp.exe -lib\b32\hbpp.lib : hbfsapi.obj hbppint.obj hbpp.obj table.obj hbpplib.obj +lib\b32\hbpp.lib : hbfsapi.obj hbppint.obj hbpp.obj hbstr.obj table.obj hbpplib.obj hbfsapi.obj : hbfsapi.c hbppint.obj : hbppint.c hbpp.obj : hbpp.c +hbstr.obj : hbstr.c table.obj : table.c hbpplib.obj : hbpplib.c diff --git a/harbour/makefile.b32 b/harbour/makefile.b32 index bc9845c7e4..57b1a382ad 100644 --- a/harbour/makefile.b32 +++ b/harbour/makefile.b32 @@ -31,7 +31,7 @@ harbour.lib : achoice.obj adir.obj alert.obj arrays.obj \ dir.obj dircmd.obj do.obj dynsym.obj dummy.obj \ environ.obj errorapi.obj errorsys.obj extend.obj \ fieldbl.obj fileread.obj filesys.obj fm.obj \ - harbinit.obj hardcr.obj hbfsapi.obj hbtrace.obj hb_f.obj hvm.obj \ + harbinit.obj hardcr.obj hbfsapi.obj hbstr.obj hbtrace.obj hb_f.obj hvm.obj \ initsymb.obj inkey.obj input.obj isprint.obj itemapi.obj \ langapi.obj mainstd.obj mainwin.obj math.obj \ mathx.obj memofile.obj memoline.obj memvars.obj \ @@ -85,6 +85,7 @@ fm.obj : fm.c extend.h hbdefs.h harbinit.obj : harbinit.c extend.h hbdefs.h hardcr.obj : hardcr.c extend.h hbdefs.h hbfsapi.obj : hbfsapi.c extend.h hbdefs.h +hbstr.obj : hbstr.c extend.h hbdefs.h hbtrace.obj : hbtrace.c extend.h hbdefs.h hb_f.obj : hb_f.c extend.h hbdefs.h hvm.obj : hvm.c extend.h hbdefs.h @@ -181,7 +182,7 @@ wait.c : wait.prg harbour.exe bcc32 $(BCC_OPT) -c -Iinclude -o$@ -DHARBOUR_USE_WIN_GTAPI $< tlib lib\b32\harbour.lib -+$@,, -harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj genpas.obj genobj32.obj expropt.obj harbour.obj hbfsapi.obj compiler.h hbppint.c hbpp.c table.c +harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj genpas.obj genobj32.obj expropt.obj harbour.obj hbfsapi.obj hbstr.obj compiler.h hbppint.c hbpp.c table.c echo $(BCC_OPT) > temp.bld echo -ebin\harbour.exe >> temp.bld echo -Iinclude;source\compiler >> temp.bld @@ -196,6 +197,7 @@ harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj ge echo source\compiler\expropt.obj >> temp.bld echo source\compiler\harbour.obj >> temp.bld echo obj\hbfsapi.obj >> temp.bld + echo obj\hbstr.obj >> temp.bld echo source\pp\hbppint.c >> temp.bld echo source\pp\hbpp.c >> temp.bld echo source\pp\table.c >> temp.bld