fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-07-11 17:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* 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
This commit is contained in:
Przemyslaw Czerpak
2009-07-11 15:30:32 +00:00
parent 8b90eb987f
commit 74bd2348a6
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -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.

11
harbour/config/dos/watcom.cf
View File

@@ -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!

5
harbour/config/os2/watcom.cf
View File

@@ -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

5
harbour/config/win/watcom.cf
View File

@@ -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