From d3fd9484c7951103f63d2fdd21b30c16d723d1d5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 15 Jul 2009 11:44:39 +0000 Subject: [PATCH] 2009-07-15 13:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/win/bcc.cf + Restored bash rules for bcc. --- harbour/ChangeLog | 4 ++++ harbour/config/win/bcc.cf | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c510863599..b0d9026a15 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-15 13:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/win/bcc.cf + + Restored bash rules for bcc. + 2009-07-15 13:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/pp/Makefile * config/rules.cf diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index a4885ec76e..9420238cbd 100644 --- a/harbour/config/win/bcc.cf +++ b/harbour/config/win/bcc.cf @@ -63,6 +63,8 @@ LDFLAGS = $(LINKPATHS) AR = tlib.exe ARFLAGS = /P64 $(HB_USER_AFLAGS) +ifeq ($(SHLVL),) # non-bash + # NOTE: The empty line below HAVE TO exist! define lib_object @echo -+$(subst /,\,$(file)) ^& >> __lib__.tmp @@ -78,4 +80,11 @@ endef AR_RULE = $(create_library) +else # bash + +AROBJS = $(foreach file, $(^F), -+$(file)) +AR_RULE = $(AR) $(ARFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(AROBJS) + +endif + include $(TOP)$(ROOT)config/rules.cf