8a6466e7fd
* Makefile
- source/hbpcre
- source/hbzlib
* external/Makefile
+ external/pcre
+ external/zlib
* external/pcre/Makefile
* external/zlib/Makefile
* external/libhpdf/Makefile
* external/libpng/Makefile
* include/hbsetup.h
* include/hbzlib.h
* include/hbregex.h
* source/rtl/hbzlibgz.c
* source/rtl/Makefile
* source/rtl/hbregexc.c
* source/rtl/hbregex.c
* source/rtl/hbzlib.c
* source/Makefile
* contrib/xhb/Makefile
* contrib/hbmzip/Makefile
* utils/hbmk2/hbmk2.prg
* config/global.mk
* config/lib.mk
* config/bin.mk
* config/detect.mk
* config/darwin/libs.mk
* config/linux/libs.mk
* config/wce/mingwarm.mk
* config/wce/poccarm.mk
* config/wce/msvcarm.mk
* config/win/xcc.mk
* config/win/mingw.mk
* config/win/pocc.mk
* config/win/bcc.mk
* config/win/watcom.mk
* config/win/icc.mk
* config/win/cygwin.mk
* config/win/msvc.mk
* config/dyn.mk
* config/os2/watcom.mk
* config/os2/gcc.mk
* config/bsd/libs.mk
* config/hpux/libs.mk
* config/sunos/libs.mk
* Changed the way embedded zlib and pcre are handled:
- They now reside in /external dir.
- They are now excluded from Harbour dynlib. This means they
will now be linked statically on non-*nix systems and
dynamically on *nix systems. On *nix it's probably easy to
switch to link statically. On non-*nix this is quite
complicated to do.
- If these libs are provided by the system, those will be used.
- On non-*nix systems the locally hosted versions will be used,
unless user overrides them using HB_INC_PCRE or HB_INC_ZLIB.
- There is currently no officially supported way to force usage
of locally hosted libs.
- If PCRE lib is forcibly disabled or not found, build system
will fall back to POSIX regex on *nix systems and Borland regex
with bcc compiler. Otherwise it will stop the build with an error.
- If zlib is forcibly disabled or not found, an error will be
generated at build-time (in hbrtl). hbmzip is simply skipped
in this case.
- hbmk2 will use local builds of these libs if they are present
in lib dir.
; TOFIX: hbmk script.
; TOFIX: dos builds. cmdline lenghts are most probably too big for them.
; NOTE: Bumps are expected.
; NOTE: I've yet to test/verify it.
- external/libhpdf/ori_src
- external/libhpdf/ori_dst
- Deleted. (added in prev commit by oversight)
107 lines
2.7 KiB
Makefile
107 lines
2.7 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
# GNU MAKE file for Borland/CodeGear C/C++ 32-bit (4.x-)
|
|
|
|
OBJ_EXT := .obj
|
|
LIB_PREF :=
|
|
LIB_EXT := .lib
|
|
|
|
HB_DYN_COPT := -DHB_DYNLIB
|
|
|
|
CC := bcc32.exe
|
|
CC_IN := -c
|
|
CC_OUT := -o
|
|
|
|
CPPFLAGS := -I. -I$(HB_INC_COMPILE)
|
|
CFLAGS := -q -tWM
|
|
LDFLAGS :=
|
|
|
|
ifneq ($(HB_BUILD_WARN),no)
|
|
CFLAGS += -w -w-sig- -Q
|
|
endif
|
|
|
|
ifneq ($(HB_BUILD_OPTIM),no)
|
|
# for some reason -6 generates the exact same code as -4 with both 5.5 and 5.8.
|
|
# -5 seems to be significantly slower than both. [vszakats]
|
|
CFLAGS += -d -6 -O2 -OS -Ov -Oi -Oc
|
|
endif
|
|
|
|
ifeq ($(HB_BUILD_MODE),cpp)
|
|
CFLAGS += -P
|
|
endif
|
|
|
|
ifeq ($(HB_BUILD_DEBUG),yes)
|
|
CFLAGS += -y -v
|
|
endif
|
|
|
|
LD := bcc32.exe
|
|
LD_OUT := -e
|
|
|
|
LIBPATHS := -L$(LIB_DIR)
|
|
# It's probably not necessary in native Windows but I need it
|
|
# for my Linux box because -L<path> seems to not work with WINE
|
|
LDLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
|
|
LDLIBS += $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT))
|
|
|
|
LDFLAGS += $(LIBPATHS)
|
|
|
|
AR := tlib.exe
|
|
ARFLAGS := /P64
|
|
AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(foreach file,$(?F),-+$(file))
|
|
|
|
ifneq ($(HB_SHELL),sh)
|
|
ifeq ($(HB_SHELL_XP),)
|
|
|
|
ifeq ($(HB_SHELL),nt)
|
|
LINECONT := ^&
|
|
else
|
|
LINECONT := &
|
|
endif
|
|
|
|
# NOTE: Command-line limit length defeating methods found below
|
|
# are only needed to support pre-Windows XP systems, where
|
|
# limit is 2047 chars. [vszakats]
|
|
|
|
# NOTE: The empty line directly before 'endef' HAVE TO exist!
|
|
define lib_object
|
|
@$(ECHO) $(ECHOQUOTE)-+$(subst /,\,$(file)) $(LINECONT)$(ECHOQUOTE) >> __lib__.tmp
|
|
|
|
endef
|
|
|
|
define create_library
|
|
$(if $(wildcard __lib__.tmp),@$(RM) __lib__.tmp,)
|
|
$(foreach file,$(?F),$(lib_object))
|
|
@$(ECHO) $(ECHOQUOTE)-+$(ECHOQUOTE)>> __lib__.tmp
|
|
$(AR) $(ARFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" @__lib__.tmp
|
|
endef
|
|
|
|
AR_RULE = $(create_library)
|
|
|
|
endif
|
|
endif
|
|
|
|
DY := ilink32.exe
|
|
DFLAGS := -q -Gn -C -aa -Tpd -Gi -x
|
|
DY_OUT :=
|
|
DLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
|
|
|
|
# NOTE: The empty line directly before 'endef' HAVE TO exist!
|
|
define dyn_object
|
|
@$(ECHO) $(ECHOQUOTE)$(subst /,\,$(file)) +$(ECHOQUOTE) >> __dyn__.tmp
|
|
|
|
endef
|
|
define create_dynlib
|
|
$(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
|
|
$(foreach file,$^,$(dyn_object))
|
|
@$(ECHO) $(ECHOQUOTE), $(subst /,\,$(DYN_DIR)/$@),, $(subst /,\,$(DLIBS)) cw32mt.lib import32.lib$(ECHOQUOTE) >> __dyn__.tmp
|
|
$(DY) $(DFLAGS) $(HB_USER_DFLAGS) c0d32.obj @__dyn__.tmp
|
|
@$(CP) $(subst /,$(DIRSEP),$(DYN_DIR)/$(basename $@)$(LIB_EXT)) $(subst /,$(DIRSEP),$(IMP_FILE))
|
|
@$(RM) $(subst /,$(DIRSEP),$(DYN_DIR)/$(basename $@)$(LIB_EXT))
|
|
endef
|
|
|
|
DY_RULE = $(create_dynlib)
|
|
|
|
include $(TOP)$(ROOT)config/rules.mk
|