* config/dos/watcom.mk
* config/linux/watcom.mk
* config/os2/watcom.mk
* config/win/watcom.mk
* src/compiler/harbour.y
* src/compiler/harbour.yyc
* utils/hbmk2/hbmk2.prg
! fix OpenWatcom disabled warning listings, numeric specifiers have
different meanings in C (wcc386) and C++ mode (wpp386) compiler
executables. "-wcd201" - not fully sure about it, is now assigned
to C mode: "unreachable code". References issue #202.
* ChangeLog.txt
! fix UTF-8 char broken by Maurizio
92 lines
2.0 KiB
Makefile
92 lines
2.0 KiB
Makefile
OBJ_EXT := .obj
|
|
LIB_PREF :=
|
|
LIB_EXT := .lib
|
|
|
|
HB_DYN_COPT := -DHB_DYNLIB -bd
|
|
|
|
ifeq ($(HB_BUILD_MODE),cpp)
|
|
CC := wpp386
|
|
else
|
|
CC := wcc386
|
|
endif
|
|
CC_IN :=
|
|
CC_OUT := -fo=
|
|
|
|
CFLAGS += -zq -bt=os2 -bm
|
|
LDFLAGS += OP quiet
|
|
|
|
ifneq ($(HB_BUILD_WARN),no)
|
|
CFLAGS += -w3
|
|
else
|
|
CFLAGS += -w1
|
|
ifeq ($(HB_BUILD_MODE),cpp)
|
|
CFLAGS += -wcd367 -wcd368
|
|
else
|
|
CFLAGS += -wcd124 -wcd136 -wcd201
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(HB_BUILD_OPTIM),no)
|
|
# architecture flags
|
|
CFLAGS += -5r -fp5
|
|
# NOTE: This is workaround for wrong code generated by OpenWatcom 1.8
|
|
# when -s switch is used for functions calling APIENTRY16 functions.
|
|
# Such code executed from non main thread causes GPF.
|
|
# So we turn off -s switch for modules affected:
|
|
ifeq ($(filter $(LIBNAME),gtos2 gtstd),)
|
|
CFLAGS += -s
|
|
endif
|
|
# optimization flags
|
|
# don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
|
|
# -oxaht
|
|
CFLAGS += -onaehtr -ei -zp4 -zt0
|
|
#CFLAGS += -obl+m
|
|
ifeq ($(CC),wpp386)
|
|
CFLAGS += -oi+
|
|
else
|
|
CFLAGS += -oi
|
|
endif
|
|
else
|
|
CFLAGS += -3r
|
|
endif
|
|
|
|
CFLAGS += -i. -i$(HB_HOST_INC)
|
|
|
|
ifeq ($(HB_BUILD_DEBUG),yes)
|
|
CFLAGS += -d2
|
|
endif
|
|
|
|
RC := wrc
|
|
RC_OUT := -fo=
|
|
RCFLAGS += -i. -i$(GRANDP) -i$(HB_HOST_INC) -q -r -zm -bt=os2
|
|
|
|
LD := wlink
|
|
ifeq ($(HB_BUILD_DEBUG),yes)
|
|
LDFLAGS += DEBUG ALL
|
|
endif
|
|
LDFLAGS += SYS os2v2
|
|
|
|
LDLIBS := $(HB_USER_LIBS)
|
|
LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
|
|
|
|
DY := $(LD)
|
|
DFLAGS += OP quiet SYS os2v2_dll
|
|
DY_OUT :=
|
|
DLIBS := $(HB_USER_LIBS)
|
|
DLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
|
|
|
|
# NOTE: The empty line directly before 'endef' HAS TO exist!
|
|
define dynlib_object
|
|
@$(ECHO) $(ECHOQUOTE)FILE '$(file)'$(ECHOQUOTE) >> __dyn__.tmp
|
|
|
|
endef
|
|
define create_dynlib
|
|
$(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
|
|
$(foreach file,$^,$(dynlib_object))
|
|
$(DY) $(DFLAGS) $(HB_USER_DFLAGS) NAME '$(subst /,$(DIRSEP),$(DYN_DIR)/$@)' OP implib='$(IMP_FILE)' @__dyn__.tmp
|
|
endef
|
|
|
|
DY_RULE = $(create_dynlib)
|
|
|
|
include $(TOP)$(ROOT)config/common/watcom.mk
|