From ad3acaea71ba063a5b43c778acf04426b61730f3 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Fri, 15 Sep 2000 21:52:46 +0000 Subject: [PATCH] See ChangeLog entry 2000-09-15 17:45 UTC-0400 David G. Holm --- harbour/ChangeLog | 12 ++++++++++++ harbour/include/hbver.h | 4 ++-- harbour/source/vm/Makefile | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c88e22b4ba..bcfb48364c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,15 @@ +2000-09-15 17:45 UTC-0400 David G. Holm + + * include/hbver.h + * Bumped revision to "b" and date to 2000-09-15 + for another interim release. + + * source/vm/Makefile + % If compiling for the w32 hb_architecture, then compile both + the mainstd.c and mainwin.c modules instead of main.c, so + that the same library can be used to make both console and + windows applications. + 2000-09-14 10:23 UTC+0800 Brian Hays * contrib/rdd_ads/ads1.c * adsSkip(): fix for dbskip(0) diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index 7a051460b0..201eba2f53 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -38,10 +38,10 @@ #define HB_VER_MAJOR 0 /* Major version number */ #define HB_VER_MINOR 35 /* Minor version number */ -#define HB_VER_REVISION "a" /* Revision letter */ +#define HB_VER_REVISION "b" /* Revision letter */ #define HB_VER_BUILD 35 /* Build number */ #define HB_VER_YEAR 2000 /* Build year */ #define HB_VER_MONTH 9 /* Build month */ -#define HB_VER_DAY 13 /* Build day */ +#define HB_VER_DAY 15 /* Build day */ #endif /* HB_VER_H_ */ diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index 652c50260a..4e5277d32f 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -4,6 +4,12 @@ ROOT = ../../ +ifeq ($(HB_ARCHITECTURE),w32) + C_MAIN := mainstd.c mainwin.c +else + C_MAIN := main.c +endif + C_SOURCES=\ arrays.c \ arrayshb.c \ @@ -23,7 +29,7 @@ C_SOURCES=\ initsymb.c \ itemapi.c \ macro.c \ - main.c \ + $(C_MAIN) \ memvars.c \ memvclip.c \ pcount.c \