From fe99453ede6d264b563222815293d0e7d163a858 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 2 Nov 2009 11:07:44 +0000
Subject: [PATCH] 2009-11-02 12:06 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * config/win/bcc.mk     ! Fixed -I order after recent change to
 not interfere with       embedded pcre headers.

---
 harbour/ChangeLog         | 5 +++++
 harbour/config/win/bcc.mk | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b5699f9ed8..aac6d2397c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-02 12:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/win/bcc.mk
+    ! Fixed -I order after recent change to not interfere with 
+      embedded pcre headers.
+
 2009-11-02 10:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
   * config/win/bcc.mk
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index b01059509d..6296b58436 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -42,9 +42,9 @@ endif
 # Hack to autoconfig bcc, and not require properly set .cfg files in its bin dir.
 # It only works if compiler autodetection is being used.
 ifneq ($(HB_COMP_PATH_PUB),)
-   CFLAGS  += $(subst \,/,-I"$(HB_COMP_PATH_PUB)../Include")
-   LDFLAGS += $(subst \,/,-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
-   DFLAGS  += $(subst \,/,-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
+   HB_CFLAGS += $(subst \,/,-I"$(HB_COMP_PATH_PUB)../Include")
+   LDFLAGS   += $(subst \,/,-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
+   DFLAGS    += $(subst \,/,-L"$(HB_COMP_PATH_PUB)../Lib" -L"$(HB_COMP_PATH_PUB)../Lib/PSDK")
 endif
 
 LD := bcc32.exe