diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 122f66d6fc..f4d67d2eaf 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +20000208-11:48 GMT+1 Antonio Linares + * makefile.b32 + + oemansi.c was missing and it is required from hbdoc + * HBDOC_OBJS changed into HBDOC_EXE_OBJS + (makefile was not completing its job cause this) + * make_b32.bat + * del make.err added + 20000208-03:15 EST Paul Tucker * makefile.vc + source/tools/dbftools.c @@ -32,14 +40,14 @@ make_b32.bat make_b40.bat * Changed to include all functionality previously implemented using - several separate make files. New makefile almost completely based on + several separate make files. New makefile almost completely based on the work of Bruno Cantero. - ngdoc/ft_helpc.prg + ngdoc/hbdoc.prg - ngdoc/makewww.bat + ngdoc/makewww.bat * FT_HELPC renamed to HBDOC * FT_HELPC() main function renamed to MAIN() - - ngdoc/bldfthe.bat + - ngdoc/bldfthe.bat - Removed since it's now built in the mainstream build process. * ngdoc/Makefile * Changed to reflect new utility name. diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index ad13e18698..df2c4f454a 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -3,5 +3,6 @@ rem rem $Id$ rem +del make.err make -fmakefile.b32 >> make.err notepad make.err diff --git a/harbour/makefile.b32 b/harbour/makefile.b32 index 1a97a26658..a6b013b8e4 100644 --- a/harbour/makefile.b32 +++ b/harbour/makefile.b32 @@ -131,6 +131,7 @@ HARBOUR_LIB_OBJS = $(OBJ_DIR)\achoice.obj \ $(OBJ_DIR)\natmsg.obj \ $(OBJ_DIR)\net.obj \ $(OBJ_DIR)\objfunc.obj \ + $(OBJ_DIR)\oemansi.obj \ $(OBJ_DIR)\oldbox.obj \ $(OBJ_DIR)\oldclear.obj \ $(OBJ_DIR)\pcount.obj \ @@ -240,7 +241,7 @@ REGRESS_EXE_OBJS = $(REGRESS_DIR)\rt_main.obj \ $(REGRESS_DIR)\rt_misc.obj HBDOC_EXE = $(HBDOC_DIR)\hbdoc.exe -HBDOC_OBJS = $(HBDOC_DIR)\hbdoc.obj +HBDOC_EXE_OBJS = $(HBDOC_DIR)\hbdoc.obj PROJECT: $(COMMON_LIB) \ $(PP_LIB) \ @@ -684,6 +685,10 @@ $(OBJ_DIR)\objfunc.obj : $(RTL_DIR)\objfunc.c bcc32 $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** tlib $(HARBOUR_LIB) -+$@,, +$(OBJ_DIR)\oemansi.obj : $(RTL_DIR)\oemansi.c + bcc32 $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** + tlib $(HARBOUR_LIB) -+$@,, + $(OBJ_DIR)\oldbox.obj : $(RTL_DIR)\oldbox.c bcc32 $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** tlib $(HARBOUR_LIB) -+$@,, @@ -1318,4 +1323,4 @@ $(HBDOC_DIR)\hbdoc.c : $(HBDOC_DIR)\hbdoc.prg $(HARBOUR_EXE) $** -i$(INCLUDE_DIR) -n -q -o$@ $(HBDOC_DIR)\hbdoc.obj : $(HBDOC_DIR)\hbdoc.c - bcc32 $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** + bcc32 $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $** \ No newline at end of file