From 3da406eb955abd7ba0125a7ac25a45570df3c356 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 16 Dec 2009 02:12:27 +0000
Subject: [PATCH] 2009-12-16 03:11 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * config/common/watcom.mk   * config/global.mk   *
 config/rules.mk     ! Added relatively ugly hack to change dir separators in
 CC_RULE in       a generic way. It's ugly because it's only needed for
 non-linux       Watcom C (not C++!) builds, but this way it's possible to
 avoid       CC_RULE override in common/watcom.mk. CC_RULE override didn't    
   implement dynlib support, which meant that after switching       to C mode
 as default for watcom, dynlib generation got broken       on win and os2.

---
 harbour/ChangeLog               | 12 ++++++++++++
 harbour/config/common/watcom.mk |  9 ++-------
 harbour/config/global.mk        |  2 ++
 harbour/config/rules.mk         |  6 +++---
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5a7ed01229..70482e91a2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-16 03:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/common/watcom.mk
+  * config/global.mk
+  * config/rules.mk
+    ! Added relatively ugly hack to change dir separators in CC_RULE in
+      a generic way. It's ugly because it's only needed for non-linux
+      Watcom C (not C++!) builds, but this way it's possible to avoid
+      CC_RULE override in common/watcom.mk. CC_RULE override didn't
+      implement dynlib support, which meant that after switching
+      to C mode as default for watcom, dynlib generation got broken
+      on win and os2.
+
 2009-12-16 02:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbqt_hbqmainwindow.cpp
     * Minor formatting after latest changes.
diff --git a/harbour/config/common/watcom.mk b/harbour/config/common/watcom.mk
index ea7195c5aa..5570c6fa2d 100644
--- a/harbour/config/common/watcom.mk
+++ b/harbour/config/common/watcom.mk
@@ -70,18 +70,13 @@ endif
 
 ifeq ($(CC),wcc386)
    ifneq ($(HB_HOST_PLAT),linux)
-      CC_RULE = $(CC) $(CC_FLAGS) $(subst /,\,$(HB_USER_CFLAGS)) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN)$(subst /,\,$<)
+      CC_DIRSEPFROM := /
+      CC_DIRSEPTO   := $(subst /,\,\)
    endif
 endif
 
 include $(TOP)$(ROOT)config/rules.mk
 
-ifeq ($(CC),wcc386)
-   ifneq ($(HB_HOST_PLAT),linux)
-      CC_FLAGS := $(subst /,\,$(CC_FLAGS))
-   endif
-endif
-
 ANYDOS := no
 ifeq ($(HB_SHELL),dos)
    ANYDOS := yes
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 9120fbd59b..d710bbab3d 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1381,6 +1381,8 @@ endif
 HB_DYN_COMPILE := no
 
 CXX :=
+CC_DIRSEPFROM :=
+CC_DIRSEPTO :=
 
 # export some variables to eliminate repeated setting in recursive calls
 export HB_HOST_PLAT
diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk
index d723671178..d51c1efb84 100644
--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -33,14 +33,14 @@ CC_FLAGS := $(HB_INC_DEPEND) $(CFLAGS) $(HB_CFLAGS)
 
 # The rule to compile a C source file.
 ifeq ($(CC_RULE),)
-   CC_RULE = $(CC) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
+   CC_RULE = $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<)
    ifneq ($(HB_BUILD_DLL),no)
       ifneq ($(HB_DYN_COPT),)
          ifneq ($(LIBNAME),)
             ifneq ($(filter $(LIBNAME),$(HB_DYN_LIBS)),)
                define cc_comp_all
-                  $(CC) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
-                  $(CC) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_DYN_POSTFIX)$(OBJ_EXT)) $(HB_DYN_COPT) $(CC_IN) $<
+                  $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<)
+                  $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_DYN_POSTFIX)$(OBJ_EXT)) $(HB_DYN_COPT) $(CC_IN) $<)
                endef
                CC_RULE = $(cc_comp_all)
             endif