From 16f07223432c52ee44f484dfab4d88252b949b39 Mon Sep 17 00:00:00 2001 From: Marek Paliwoda Date: Sun, 12 Nov 2006 08:29:27 +0000 Subject: [PATCH] 2006-11-12 09:30 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) * harbour/makefile.bc * harbour/makefile.vc * Fixed pptable.c dependencies --- harbour/ChangeLog | 5 +++++ harbour/makefile.bc | 4 +++- harbour/makefile.vc | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cb21fe9b7e..86b1033d27 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ + __PREPROCESS( , ) -> + preprocess given code and return result + + User can create more then one PP context and then use each of them + separately. Any modification in one context have no effect in other. 2006-11-12 09:30 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) * harbour/makefile.bc diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 6669d840a0..a7018e5dfe 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -251,6 +251,7 @@ doClean: -if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul -if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul -if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul + -if exist $(PP_DIR)\pptable.c $(DEL) $(PP_DIR)\pptable.c > nul -if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul -if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul -if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul @@ -620,7 +621,8 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c # Generated by an intermediate utility ppgen.exe # built at the initial phase of build process -$(PP_DIR)\pptable.c : $(BIN_DIR)\ppgen.exe +$(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c +$(PP_DIR)\pptable.c : $(BIN_DIR)\ppgen.exe include\hbstdgen.ch IF EXIST "$(PP_DIR)\pptable.c" $(DEL) "$(PP_DIR)\pptable.c" > nul $(BIN_DIR)\ppgen.exe include/hbstdgen.ch -o$(PP_DIR)/pptable.c -q diff --git a/harbour/makefile.vc b/harbour/makefile.vc index d2cf7c419a..06e7b62053 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -680,6 +680,7 @@ doClean: -if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul -if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul -if exist $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > nul + -if exist $(PP_DIR)\pptable.c $(DEL) $(PP_DIR)\pptable.c > nul -if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul -if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul -if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul @@ -955,7 +956,8 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c # Generated by an intermediate utility ppgen.exe # built at the initial phase of build process -$(PP_DIR)\pptable.c : include\hbstdgen.ch +$(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c +$(PP_DIR)\pptable.c : $(BIN_DIR)\ppgen.exe include\hbstdgen.ch IF EXIST "$(PP_DIR)\pptable.c" $(DEL) "$(PP_DIR)\pptable.c" > nul $(BIN_DIR)\ppgen.exe include/hbstdgen.ch -o$(PP_DIR)/pptable.c -q