From ef68bb6fc457d2782e911b38e8ba4b815e6209d6 Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Mon, 29 May 2000 07:27:31 +0000 Subject: [PATCH] updates for msvc --- harbour/ChangeLog | 13 +++++++++++++ harbour/contrib/libct/make_vc.bat | 9 --------- harbour/contrib/libct/makefile.vc | 18 ++++-------------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 623cba2657..850ac54528 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,16 @@ +2000-05-29 03:25 UTC-0500 Paul Tucker + * contrib\libct\makefile.vc + * contrib\libgt\makefile.vc + * contrib\libmisc\makefile.vc + * contrib\libnf\makefile.vc + * contrib\rdd_ads\makefile.vc + * contrib\libct\make_vc.bat + * contrib\libgt\make_vc.bat + * contrib\libmisc\make_vc.bat + * contrib\libnf\make_vc.bat + * contrib\rdd_ads\make_vc.bat + * proper parameters are now 'clean' and 'all' (/a can still be used as all) + 2000-05-29 08:29 UTC+0100 Victor Szakats * source/rtl/xsavescr.c diff --git a/harbour/contrib/libct/make_vc.bat b/harbour/contrib/libct/make_vc.bat index 4f927c2953..127d89990b 100644 --- a/harbour/contrib/libct/make_vc.bat +++ b/harbour/contrib/libct/make_vc.bat @@ -3,9 +3,6 @@ rem rem $Id$ rem -if "%1" == "clean" goto CLEAN -if "%1" == "CLEAN" goto CLEAN - :BUILD nmake /f makefile.vc %1 %2 %3 > make_vc.log @@ -19,12 +16,6 @@ if "%1" == "CLEAN" goto CLEAN :BUILD_ERR notepad make_vc.log - goto EXIT - -:CLEAN - - call %0 /A %2 %3 %4 - goto EXIT :EXIT diff --git a/harbour/contrib/libct/makefile.vc b/harbour/contrib/libct/makefile.vc index ffc1c15d2b..a9d0c82b0b 100644 --- a/harbour/contrib/libct/makefile.vc +++ b/harbour/contrib/libct/makefile.vc @@ -52,7 +52,7 @@ MK_FLAGS = $(MAKEFLAGS: =) OBJ_DIR = ..\..\obj\vc LIB_DIR = ..\..\lib\vc -BIN_DIR = ..\..\bin\vc +BIN_DIR = ..\..\bin # # Directory macros. These should never have to change. @@ -126,14 +126,10 @@ TOOLS_LIB_OBJS = \ # -!if ( "$(MK_FLAGS)"=="A" ) - -all: zot \ +all: \ $(TOOLS_LIB) -MK_FLAGS = $(MK_FLAGS:A=) - -zot: +CLEAN: -@if exist $(OBJ_DIR)\ctchksum.* del $(OBJ_DIR)\ctchksum.* -@if exist $(OBJ_DIR)\ctchrevn.* del $(OBJ_DIR)\ctchrevn.* -@if exist $(OBJ_DIR)\ctchrmix.* del $(OBJ_DIR)\ctchrmix.* @@ -143,13 +139,7 @@ zot: -@if exist $(OBJ_DIR)\ctposupp.* del $(OBJ_DIR)\ctposupp.* -@if exist $(OBJ_DIR)\ctmisc.* del $(OBJ_DIR)\ctmisc.* -@if exist $(OBJ_DIR)\cttoken.* del $(OBJ_DIR)\cttoken.* - -!else - -all: \ - $(TOOLS_LIB) - -!endif + -@if exist $(TOOLS_LIB) del $(TOOLS_LIB) # # Library dependencies and build rules