From 34f1e47f04b393f63e2ae2602eea32c10d65c294 Mon Sep 17 00:00:00 2001 From: Jean-Francois Lefebvre Date: Wed, 29 Nov 2006 09:33:17 +0000 Subject: [PATCH] 2006-11-29 10:30 UTC+0100 J. Lefebvre (jfl/at/mafact.com) --- harbour/ChangeLog | 4 ++++ harbour/makefile.vc | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 962d7056f9..f4b33fad32 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2006-11-29 10:30 UTC+0100 J. Lefebvre (jfl/at/mafact.com) + * harbour/makefile.vc + * Sync. with makefile.bc for msvc compiler. + 2006-11-28 21:40 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/makefile.bc * harbour/config/c.cf diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 0e15cae27e..1441ea1158 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -963,9 +963,27 @@ $(PP_DIR)\pptable.c : $(BIN_DIR)\ppgen.exe include\hbstdgen.ch #********************************************************** +!if "$(HB_REBUILD_PARSER)" == "yes" + $(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y bison --no-line -p hb_macro -d $** -o$@ +$(OBJ_DIR)\harboury.c : $(HARBOUR_DIR)\harbour.y + bison --no-line -d $** -o$@ + +!else + +$(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.yyc + copy /A /Y $** $@ >> inst_$(CC_DIRNAME).log + copy /A /Y $(**:.yyc=.yyh) $(@:.c=.h) >> inst_$(CC_DIRNAME).log + +$(OBJ_DIR)\harboury.c : $(HARBOUR_DIR)\harbour.yyc + copy /A /Y $** $@ >> inst_$(CC_DIRNAME).log + copy /A /Y $(**:.yyc=.yyh) $(@:.c=.h) >> inst_$(CC_DIRNAME).log + +!endif + + $(OBJ_DIR)\macrol.c : $(MACRO_DIR)\macro.l flex -Phb_macro -i -8 -o$@ $** @@ -975,10 +993,6 @@ $(OBJ_DIR)\macrol.obj : $(OBJ_DIR)\macrol.c $(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -Fo$(OBJ_DIR)\ $** $(DEL) $(OBJ_DIR)\unistd.h -#********************************************************** - -$(OBJ_DIR)\harboury.c : $(HARBOUR_DIR)\harbour.y - bison --no-line -d $** -o$@ $(OBJ_DIR)\harbourl.c : $(HARBOUR_DIR)\harbour.l flex -i -8 -o$@ $**