From 635029ae2463fb2cb1fa00491dc1587d35bab5d1 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 16 Jul 2009 12:19:51 +0000 Subject: [PATCH] 2009-07-16 14:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/global.cf ! yet another fix for exporting relative paths in HB_BIN_COMPILE * harbour/config/wce/global.cf ! disabled HB_FLAGSEXTRA=-D__PLATFORM__WINCE -D__PLATFORM__WINCE is already added in global.ch --- harbour/ChangeLog | 8 ++++++++ harbour/config/global.cf | 4 +++- harbour/config/wce/global.cf | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0b7c76ac3b..83aa71ab1d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-16 14:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/global.cf + ! yet another fix for exporting relative paths in HB_BIN_COMPILE + + * harbour/config/wce/global.cf + ! disabled HB_FLAGSEXTRA=-D__PLATFORM__WINCE + -D__PLATFORM__WINCE is already added in global.ch + 2009-07-16 13:32 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/utils/hbmk2/hbmk2.prg ! fixed small typo which broke non windows builds diff --git a/harbour/config/global.cf b/harbour/config/global.cf index 8b9c1cc064..b21517300a 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -201,12 +201,14 @@ ifneq ($(HB_HOST_ARCH)$(HB_HOST_CPU),$(HB_ARCHITECTURE)$(HB_CPU)) HB_BIN_COMPILE := $(dir $(firstword $(wildcard $(TOP)$(ROOT)bin/$(HB_HOST_ARCH)/*/harbour$(HB_HOST_BIN_EXT)))) ifeq ($(HB_BIN_COMPILE),) HB_BIN_COMPILE := $(dir $(firstword $(foreach dir,$(subst $(PTHSEP), ,$(PATH)),$(wildcard $(dir)/harbour$(HB_HOST_BIN_EXT))))) + ifeq ($(HB_BIN_COMPILE),) + export HB_BIN_COMPILE + endif endif ifeq ($(HB_BIN_COMPILE),) $(warning Warning: HB_BIN_COMPILE not specified. Couldn't find native build.) else $(info HB_BIN_COMPILE not specified. Automatically set to: $(HB_BIN_COMPILE)) - export HB_BIN_COMPILE endif endif endif diff --git a/harbour/config/wce/global.cf b/harbour/config/wce/global.cf index 01051c5623..fd7140255a 100644 --- a/harbour/config/wce/global.cf +++ b/harbour/config/wce/global.cf @@ -9,7 +9,7 @@ HB_GT_LIBS += gtwvt gtgui # Favor size for CE builds. HB_GCMODE = 0 -HB_FLAGSEXTRA = -D__PLATFORM__WINCE +#HB_FLAGSEXTRA = -D__PLATFORM__WINCE ifeq ($(HB_DYNLIB),yes) HB_CDYNLIB = -DHB_DYNLIB