diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1c8d707f1c..075ccda477 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,42 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-05 21:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * external/Makefile + + Added bzip2. + + * external/bzip2/Makefile + ! Fixed to avoid stupid BCC tlib warning by enabling + "case-sensitive library" option. + + * config/global.mk + * config/beos/gcc.mk + * config/bsd/gcc.mk + * config/wce/mingwarm.mk + * config/wce/poccarm.mk + * config/wce/msvcarm.mk + * config/darwin/gcc.mk + * config/darwin/icc.mk + * config/darwin/clang.mk + * config/hpux/gcc.mk + * config/dos/djgpp.mk + * config/common/watcom.mk + * config/win/xcc.mk + * config/win/mingw.mk + * config/win/pocc.mk + * config/win/bcc.mk + * config/win/icc.mk + * config/win/cygwin.mk + * config/win/msvc.mk + * config/linux/gcc.mk + * config/linux/icc.mk + * config/linux/clang.mk + * config/linux/sunpro.mk + * config/os2/gcc.mk + * config/sunos/gcc.mk + * config/sunos/sunpro.mk + + Added support for HB_AFLAGS. Only bcc needs it ATM. + 2010-03-05 20:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/common/hbverdsp.c % "Language options" merged into "Build options" diff --git a/harbour/config/beos/gcc.mk b/harbour/config/beos/gcc.mk index 4636eeb86c..e827b60ab4 100644 --- a/harbour/config/beos/gcc.mk +++ b/harbour/config/beos/gcc.mk @@ -41,7 +41,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := $(HB_CCPREFIX)ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk index 8820fa73d8..cd2881734b 100644 --- a/harbour/config/bsd/gcc.mk +++ b/harbour/config/bsd/gcc.mk @@ -39,7 +39,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := $(HB_CCPREFIX)ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/common/watcom.mk b/harbour/config/common/watcom.mk index 239fdcc0ec..6932efd750 100644 --- a/harbour/config/common/watcom.mk +++ b/harbour/config/common/watcom.mk @@ -27,7 +27,7 @@ comma := , LDFILES_COMMA = $(subst $(subst x,x, ),$(comma) ,$(^F)) LDLIBS_COMMA := $(subst $(subst x,x, ),$(comma) ,$(strip $(LDLIBS))) LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES_COMMA) $(if $(LDLIBS_COMMA), LIB $(LDLIBS_COMMA),) -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file)) +AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file)) ifeq ($(HB_SHELL),dos) @@ -62,7 +62,7 @@ ifeq ($(HB_SHELL),dos) define create_library @$(ECHO) $(ECHOQUOTE)$(LIB_DIR)/$@$(ECHOQUOTE) > __lib__.tmp $(foreach file,$(^F),$(lib_object)) - $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp + $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp endef AR_RULE = $(create_library) diff --git a/harbour/config/darwin/clang.mk b/harbour/config/darwin/clang.mk index de1132c6d8..e0664a8378 100644 --- a/harbour/config/darwin/clang.mk +++ b/harbour/config/darwin/clang.mk @@ -52,7 +52,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := libtool -AR_RULE = ( $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) -static $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(AR) DFLAGS += -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module $(LIBPATHS) diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk index f9abd8615e..567a7287bd 100644 --- a/harbour/config/darwin/gcc.mk +++ b/harbour/config/darwin/gcc.mk @@ -53,7 +53,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := libtool -AR_RULE = ( $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) -static $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(AR) DFLAGS += -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module $(LIBPATHS) diff --git a/harbour/config/darwin/icc.mk b/harbour/config/darwin/icc.mk index 9ffe87e8f0..92bea23f51 100644 --- a/harbour/config/darwin/icc.mk +++ b/harbour/config/darwin/icc.mk @@ -41,7 +41,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := libtool -AR_RULE = ( $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) -static $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(AR) DFLAGS += -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module $(LIBPATHS) diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk index c4cd069aef..1f90b49581 100644 --- a/harbour/config/dos/djgpp.mk +++ b/harbour/config/dos/djgpp.mk @@ -81,7 +81,7 @@ define create_library $(foreach file,$(^F),$(lib_object)) @$(ECHO) $(ECHOQUOTE)SAVE$(ECHOQUOTE) >> __lib__.tmp @$(ECHO) $(ECHOQUOTE)END$(ECHOQUOTE) >> __lib__.tmp - $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp + $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp $(ARSTRIP) endef diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 74dbb1fd7a..b4e2d252b2 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -1066,6 +1066,7 @@ endif # result in recursive runs, see rule 'descend'. [vszakats] HB_CFLAGS := HB_LDFLAGS := +HB_AFLAGS := HB_PRGFLAGS := CFLAGS := diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk index f3976f8da3..d4fac19781 100644 --- a/harbour/config/hpux/gcc.mk +++ b/harbour/config/hpux/gcc.mk @@ -45,7 +45,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := $(HB_CCPREFIX)ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rc $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rc $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/linux/clang.mk b/harbour/config/linux/clang.mk index fac941e307..5ded1c55aa 100644 --- a/harbour/config/linux/clang.mk +++ b/harbour/config/linux/clang.mk @@ -46,7 +46,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := $(HB_CCPREFIX)ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk index 2564685ae3..94adefb621 100644 --- a/harbour/config/linux/gcc.mk +++ b/harbour/config/linux/gcc.mk @@ -43,7 +43,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := $(HB_CCPREFIX)ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/linux/icc.mk b/harbour/config/linux/icc.mk index f67fb72add..bee923fbc0 100644 --- a/harbour/config/linux/icc.mk +++ b/harbour/config/linux/icc.mk @@ -46,7 +46,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := xiar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk index bb42964308..9c18060a0b 100644 --- a/harbour/config/linux/sunpro.mk +++ b/harbour/config/linux/sunpro.mk @@ -61,7 +61,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) DFLAGS += -G $(HB_ISAOPT) $(LIBPATHS) diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk index 26e58d95fe..d87a708cef 100644 --- a/harbour/config/os2/gcc.mk +++ b/harbour/config/os2/gcc.mk @@ -69,7 +69,7 @@ ifeq ($(HB_COMPILER),gccomf) # NOTE: The empty line directly before 'endef' HAS TO exist! # It causes that every command will be separated by LF define lib_object - $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -p128 r $(LIB_DIR)/$@ $(file)$(ECHOQUOTE) + $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -p128 r $(LIB_DIR)/$@ $(file)$(ECHOQUOTE) endef @@ -93,7 +93,7 @@ else $(foreach file,$^,$(lib_object)) @$(ECHO) $(ECHOQUOTE)SAVE$(ECHOQUOTE) >> __lib__.tmp @$(ECHO) $(ECHOQUOTE)END$(ECHOQUOTE) >> __lib__.tmp - $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp + $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp endef endif diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk index 4e4ed67ed3..ae2da986ed 100644 --- a/harbour/config/sunos/gcc.mk +++ b/harbour/config/sunos/gcc.mk @@ -43,7 +43,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := $(HB_CCPREFIX)ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rc $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rc $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk index e27c53f73d..92d0be84da 100644 --- a/harbour/config/sunos/sunpro.mk +++ b/harbour/config/sunos/sunpro.mk @@ -66,7 +66,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rc $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rc $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && false ) DY := $(CC) DFLAGS += -G $(HB_ISAOPT) $(LIBPATHS) diff --git a/harbour/config/wce/mingwarm.mk b/harbour/config/wce/mingwarm.mk index e73d50b786..f9a6c4c47d 100644 --- a/harbour/config/wce/mingwarm.mk +++ b/harbour/config/wce/mingwarm.mk @@ -51,7 +51,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := $(HB_CCPATH)$(HB_CCPREFIX)ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk index 974c1a2f10..555d1d23e6 100644 --- a/harbour/config/wce/msvcarm.mk +++ b/harbour/config/wce/msvcarm.mk @@ -87,7 +87,7 @@ endif LDFLAGS += $(LIBPATHS) AR := lib.exe -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ +AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ DY := $(LD) DFLAGS += -nologo -dll -subsystem:windowsce $(LIBPATHS) diff --git a/harbour/config/wce/poccarm.mk b/harbour/config/wce/poccarm.mk index 4487737827..fb3cbce4b6 100644 --- a/harbour/config/wce/poccarm.mk +++ b/harbour/config/wce/poccarm.mk @@ -50,7 +50,7 @@ LDFLAGS += -subsystem:windows LDFLAGS += $(LIBPATHS) AR := polib.exe -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F) +AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F) DY := $(LD) DFLAGS += -nologo -dll $(LIBPATHS) diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk index bba9517dd2..6da9859a62 100644 --- a/harbour/config/win/bcc.mk +++ b/harbour/config/win/bcc.mk @@ -55,7 +55,7 @@ LDLIBS := $(strip $(HB_USER_LIBS) $(LIBS) $(SYSLIBS)) AR := tlib.exe ARFLAGS += /P128 -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(foreach file,$(?F),-+$(file)) +AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(foreach file,$(?F),-+$(file)) ifneq ($(HB_SHELL),sh) ifeq ($(HB_SHELL_XP),) @@ -80,7 +80,7 @@ ifneq ($(HB_SHELL),sh) $(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 + $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" @__lib__.tmp endef AR_RULE = $(create_library) diff --git a/harbour/config/win/cygwin.mk b/harbour/config/win/cygwin.mk index 2d2f80f6cd..62606802e4 100644 --- a/harbour/config/win/cygwin.mk +++ b/harbour/config/win/cygwin.mk @@ -48,7 +48,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) LDFLAGS += $(LIBPATHS) AR := $(HB_CCPATH)$(HB_CCPREFIX)ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || $(RM) $(LIB_DIR)/$@ +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || $(RM) $(LIB_DIR)/$@ DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/win/icc.mk b/harbour/config/win/icc.mk index c6b6e2ed49..ffb39e0273 100644 --- a/harbour/config/win/icc.mk +++ b/harbour/config/win/icc.mk @@ -49,7 +49,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) LDFLAGS += -nologo $(LIBPATHS) AR := xilib.exe -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ +AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ DY := $(LD) DFLAGS += -nologo -dll -subsystem:console $(LIBPATHS) diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk index c62d145e0c..a2b7bc7252 100644 --- a/harbour/config/win/mingw.mk +++ b/harbour/config/win/mingw.mk @@ -69,7 +69,7 @@ endif LDFLAGS += $(LIBPATHS) AR := $(HB_CCPATH)$(HB_CCPREFIX)ar -AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@) DY := $(CC) DFLAGS += -shared $(LIBPATHS) diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk index 6fc8f49510..69c3cf89d8 100644 --- a/harbour/config/win/msvc.mk +++ b/harbour/config/win/msvc.mk @@ -74,7 +74,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) LDFLAGS += -nologo $(LIBPATHS) AR := lib.exe -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ +AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@ DY := $(LD) DFLAGS += -nologo -dll -subsystem:console $(LIBPATHS) diff --git a/harbour/config/win/pocc.mk b/harbour/config/win/pocc.mk index c5fcd46348..6d183eeadb 100644 --- a/harbour/config/win/pocc.mk +++ b/harbour/config/win/pocc.mk @@ -43,7 +43,7 @@ LDFLAGS += -subsystem:console LDFLAGS += $(LIBPATHS) AR := polib.exe -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F) +AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F) DY := $(LD) DFLAGS += -nologo -dll $(LIBPATHS) diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk index 0f831a257c..4f2e836c29 100644 --- a/harbour/config/win/xcc.mk +++ b/harbour/config/win/xcc.mk @@ -50,7 +50,7 @@ LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) LDFLAGS += $(LIBPATHS) AR := xlib.exe -AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F) +AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F) DY := $(LD) DFLAGS += -nologo -dll $(LIBPATHS) diff --git a/harbour/external/Makefile b/harbour/external/Makefile index 6cbb1ae513..d948eb92bf 100644 --- a/harbour/external/Makefile +++ b/harbour/external/Makefile @@ -7,6 +7,7 @@ ROOT := ../ # standalone contribs DIRS := \ sqlite3 \ + bzip2 \ libhpdf \ libpng \ jpeg \ diff --git a/harbour/external/bzip2/Makefile b/harbour/external/bzip2/Makefile index 8802ec70fa..aeda9833c5 100644 --- a/harbour/external/bzip2/Makefile +++ b/harbour/external/bzip2/Makefile @@ -32,9 +32,9 @@ _DET_INC_HEAD := /bzlib.h include $(TOP)$(ROOT)config/detfun.mk ifneq ($(HB_HAS_BZIP2_LOCAL),) -# ifeq ($(HB_PLATFORM),win) -# HB_CFLAGS += -D_WIN32 -# endif + ifeq ($(HB_COMPILER),bcc) + HB_AFLAGS += /C + endif include $(TOP)$(ROOT)config/lib.mk else HB_SKIP_REASON := unused