2009-08-20 15:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* config/dos/watcom.mk
    * DOS shell specific hacks protected by HB_SHELL guard.
    * Merged together DOS shell specific hacks.

  * config/win/watcom.mk
  * config/linux/watcom.mk
  * config/os2/watcom.mk
    + Added DOS shell specific hacks, so that cross-builds to these 
      targets on DOS hosts work.
This commit is contained in:
Viktor Szakats
2009-08-20 13:38:47 +00:00
parent b316dffb15
commit 809b984774
5 changed files with 78 additions and 14 deletions

View File

@@ -17,6 +17,17 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-20 15:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/dos/watcom.mk
* DOS shell specific hacks protected by HB_SHELL guard.
* Merged together DOS shell specific hacks.
* config/win/watcom.mk
* config/linux/watcom.mk
* config/os2/watcom.mk
+ Added DOS shell specific hacks, so that cross-builds to these
targets on DOS hosts work.
2009-08-20 14:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
* INSTALL

View File

@@ -64,14 +64,6 @@ ifeq ($(CC),wcc386)
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!
# It causes that every command will be separated by LF
define link_file
@@ -124,11 +116,21 @@ AR := wlib
ARFLAGS := -q -p=64 -c -n
AR_RULE = $(create_library)
# disable DOS/4GW Banner
export DOS4G := quiet
ifeq ($(HB_SHELL),dos)
# disable DOS/4GW Banner
export DOS4G := quiet
# work arround to DOS command line size limit
ifeq ($(CC),wcc386)
export WCC386 := $(strip $(CPPFLAGS))
else
export WPP386 := $(strip $(CPPFLAGS))
endif
CPPFLAGS :=
export HARBOURCMD := $(HB_FLAGS)
HB_FLAGS :=
endif
include $(TOP)$(ROOT)config/rules.mk
# work arround to DOS command line size limit
export HARBOURCMD := $(HB_FLAGS)
HB_FLAGS :=

View File

@@ -85,4 +85,21 @@ AR := wlib
ARFLAGS := -q -c -n
AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))
ifeq ($(HB_SHELL),dos)
# disable DOS/4GW Banner
export DOS4G := quiet
# work arround to DOS command line size limit
ifeq ($(CC),wcc386)
export WCC386 := $(strip $(CPPFLAGS))
else
export WPP386 := $(strip $(CPPFLAGS))
endif
CPPFLAGS :=
export HARBOURCMD := $(HB_FLAGS)
HB_FLAGS :=
endif
include $(TOP)$(ROOT)config/rules.mk

View File

@@ -108,4 +108,21 @@ AR := wlib
ARFLAGS := -q -p=64 -c -n
AR_RULE = $(create_library)
ifeq ($(HB_SHELL),dos)
# disable DOS/4GW Banner
export DOS4G := quiet
# work arround to DOS command line size limit
ifeq ($(CC),wcc386)
export WCC386 := $(strip $(CPPFLAGS))
else
export WPP386 := $(strip $(CPPFLAGS))
endif
CPPFLAGS :=
export HARBOURCMD := $(HB_FLAGS)
HB_FLAGS :=
endif
include $(TOP)$(ROOT)config/rules.mk

View File

@@ -115,4 +115,21 @@ AR := wlib
ARFLAGS := -q -p=64 -c -n
AR_RULE = $(create_library)
ifeq ($(HB_SHELL),dos)
# disable DOS/4GW Banner
export DOS4G := quiet
# work arround to DOS command line size limit
ifeq ($(CC),wcc386)
export WCC386 := $(strip $(CPPFLAGS))
else
export WPP386 := $(strip $(CPPFLAGS))
endif
CPPFLAGS :=
export HARBOURCMD := $(HB_FLAGS)
HB_FLAGS :=
endif
include $(TOP)$(ROOT)config/rules.mk