From 74bd2348a6fe41a1298a86c181fab0c49ee92efb Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Sat, 11 Jul 2009 15:30:32 +0000
Subject: [PATCH] 2009-07-11 17:30 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/config/dos/watcom.cf   *
 harbour/config/win/watcom.cf   * harbour/config/os2/watcom.cf     ! hacked to
 not revert slashes to backslashes for wcc in Linux host OS       It's not
 clean solution because it will have to be adopted also for       other OS2
 ports

  * harbour/config/dos/watcom.cf
    ! fixed passing parameters to wcc by environment variable
---
 harbour/ChangeLog            | 11 +++++++++++
 harbour/config/dos/watcom.cf | 11 +++++++++++
 harbour/config/os2/watcom.cf |  5 +++--
 harbour/config/win/watcom.cf |  5 +++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 96313bf3ce..4db0792c0f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-11 17:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/dos/watcom.cf
+  * harbour/config/win/watcom.cf
+  * harbour/config/os2/watcom.cf
+    ! hacked to not revert slashes to backslashes for wcc in Linux host OS
+      It's not clean solution because it will have to be adopted also for
+      other OS2 ports
+
+  * harbour/config/dos/watcom.cf
+    ! fixed passing parameters to wcc by environment variable
+
 2009-07-11 17:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/os2/watcom.cf
     ! Protected dirsep trick to only kick in with NT Shell.
diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf
index d908850839..64c5491d6f 100644
--- a/harbour/config/dos/watcom.cf
+++ b/harbour/config/dos/watcom.cf
@@ -60,8 +60,19 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CPPFLAGS += -d2
 endif
 
+ifeq ($(CC),wcc386)
+ifeq ($(subst linux,,$(OSTYPE)),$(OSTYPE))
+CPPFLAGS := $(subst /,\,$(CPPFLAGS))
+CC_RULE = $(CC) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(CC_IN)$(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+endif
+endif
+
 # work arround to DOS command line size limit
+ifeq ($(CC),wcc386)
+export WCC386 := $(strip $(CPPFLAGS))
+else
 export WPP386 := $(strip $(CPPFLAGS))
+endif
 CPPFLAGS =
 
 # Note: The empty line directly before 'endef' HAVE TO exist!
diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf
index 6b4e2dbae9..1a36d5dd6e 100644
--- a/harbour/config/os2/watcom.cf
+++ b/harbour/config/os2/watcom.cf
@@ -60,9 +60,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CPPFLAGS += -d2
 endif
 
-ifeq ($(SHLVL),) # NT Shell
 ifeq ($(CC),wcc386)
-CC_RULE = $(CC) $(subst /,\,$(CPPFLAGS)) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(subst /,\,$(CC_IN)) $(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+ifeq ($(subst linux,,$(OSTYPE)),$(OSTYPE))
+CPPFLAGS := $(subst /,\,$(CPPFLAGS))
+CC_RULE = $(CC) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(CC_IN)$(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
 endif
 endif
 
diff --git a/harbour/config/win/watcom.cf b/harbour/config/win/watcom.cf
index cafc71c4c3..c69c0bfd30 100644
--- a/harbour/config/win/watcom.cf
+++ b/harbour/config/win/watcom.cf
@@ -62,9 +62,10 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CPPFLAGS += -d2
 endif
 
-ifeq ($(SHLVL),) # NT Shell
 ifeq ($(CC),wcc386)
-CC_RULE = $(CC) $(subst /,\,$(CPPFLAGS)) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(subst /,\,$(CC_IN)) $(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+ifeq ($(subst linux,,$(OSTYPE)),$(OSTYPE))
+CPPFLAGS := $(subst /,\,$(CPPFLAGS))
+CC_RULE = $(CC) $(CPPFLAGS) $(subst /,\,$(CFLAGS)) $(HB_CDBG) $(subst /,\,$(HB_USER_CFLAGS)) $(HB_CDYNLIB) $(CC_IN)$(subst /,\,$<) $(CC_OUT)$(<F:.c=$(OBJ_EXT))
 endif
 endif