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

2009-12-16 03:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2009-12-16 02:12:27 +00:00
parent 782ae37170
commit 3da406eb95
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

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

9
harbour/config/common/watcom.mk
View File

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

2
harbour/config/global.mk
View File

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

6
harbour/config/rules.mk
View File

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