From d4d6cf81509dd457954d1ddbc30c5e08fbd99389 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Fri, 31 Aug 2001 18:28:04 +0000 Subject: [PATCH] See ChangeLog entry 2001-08-31 14:30 UTC-0400 David G. Holm --- harbour/ChangeLog | 10 ++++++++++ harbour/config/os2/icc.cf | 2 +- harbour/source/vm/Makefile | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f09ac0e5ee..3ccd7176c0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,13 @@ +2001-08-31 14:30 UTC-0400 David G. Holm + + * config/os2/icc.cf + * source/vm/Makefile + * Build and use mainstd.c for OS/2 instead of main.c in order + to avoid the main.c build dependencies. + + Note to builders of OS/2 binary distributions: Please be + sure to include both the mainstd and mainpm object files! + 2001-08-31 12:15 GMT+1 Ignacio Ortiz * source/bin/bld.bat * source/include/extend.api diff --git a/harbour/config/os2/icc.cf b/harbour/config/os2/icc.cf index 39b13fb46f..d39bdb4540 100644 --- a/harbour/config/os2/icc.cf +++ b/harbour/config/os2/icc.cf @@ -25,7 +25,7 @@ ifeq ($(C_MAIN),) ifeq ($(HB_GT_LIB),os2pm) LDFLAGS +=/B"/PMtype:PM" $(TOP)$(ROOT)source/vm/$(ARCH)/mainpm.obj else -LDFLAGS += $(TOP)$(ROOT)source/vm/$(ARCH)/main.obj +LDFLAGS += $(TOP)$(ROOT)source/vm/$(ARCH)/mainstd.obj endif endif endif diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index 10dca681d0..5d5a393e78 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -8,7 +8,7 @@ ifeq ($(HB_ARCHITECTURE),w32) C_MAIN := mainstd.c mainwin.c else ifeq ($(HB_ARCHITECTURE),os2) - C_MAIN := main.c mainpm.c + C_MAIN := mainstd.c mainpm.c else C_MAIN := main.c endif