From 8fa85653a109de8cc3ef27cb75ebaf65e1f08ac6 Mon Sep 17 00:00:00 2001 From: Jacek Kubica Date: Sun, 13 Nov 2005 19:57:43 +0000 Subject: [PATCH] *** empty log message *** --- harbour/ChangeLog | 4 ++++ harbour/contrib/rdd_ads/make_b32.bat | 1 + harbour/contrib/rdd_ads/makefile.bc | 8 ++------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f6d9232aee..659176ea1d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,10 @@ For example: 2002-12-01 13:30 UTC+0100 Foo Bar */ +2005-11-13 20:50 UTC+0100 Jacek Kubica (kubica/at/wssk.wroc.pl) + * harbour/contrib/rdd_ads/makefile.bc + * harbour/contrib/rdd_ads/make_b32.bat + ! updated - synced with xHarbour 2005-11-13 12:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/ole/ole2.c diff --git a/harbour/contrib/rdd_ads/make_b32.bat b/harbour/contrib/rdd_ads/make_b32.bat index 53c28a817d..3982d492b5 100644 --- a/harbour/contrib/rdd_ads/make_b32.bat +++ b/harbour/contrib/rdd_ads/make_b32.bat @@ -14,6 +14,7 @@ if "%1" == "CLEAN" goto CLEAN :BUILD_OK copy ..\..\lib\b32\rddads.lib ..\..\lib\*.* > nul + if exist ..\..\lib\b32\rddads.bak del ..\..\lib\b32\rddads.bak goto EXIT :BUILD_ERR diff --git a/harbour/contrib/rdd_ads/makefile.bc b/harbour/contrib/rdd_ads/makefile.bc index 3c77554517..7ed6531fcf 100644 --- a/harbour/contrib/rdd_ads/makefile.bc +++ b/harbour/contrib/rdd_ads/makefile.bc @@ -12,21 +12,17 @@ OBJ_DIR = ..\..\obj\b32 LIB_DIR = ..\..\lib\b32 $(LIB_DIR)\rddads.lib : \ - $(OBJ_DIR)\ads0.obj \ $(OBJ_DIR)\ads1.obj \ $(OBJ_DIR)\adsfunc.obj \ $(OBJ_DIR)\adsmgmnt.obj -$(OBJ_DIR)\ads0.c : ads0.prg -$(OBJ_DIR)\ads0.obj : $(OBJ_DIR)\ads0.c $(OBJ_DIR)\ads1.obj : ads1.c $(OBJ_DIR)\adsfunc.obj : adsfunc.c $(OBJ_DIR)\adsmgmnt.obj : adsmgmnt.c .c.obj: - bcc32 $(CLIBFLAGS) -c -O2 -I$(INCLUDE_DIR) -o$@ $< + bcc32 $(CLIBFLAGS) $(C_USR) -c -O2 -DWIN32 -I$(INCLUDE_DIR) -o$@ $< tlib $(LIB_DIR)\rddads.lib -+$@,, .prg.c: - $(BIN_DIR)\harbour.exe $< -q0 -w -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@ - + $(BIN_DIR)\harbour.exe $< -q0 -w -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@