diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3fee7ecee6..84ec7ffb13 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2012-04-01 11:55 UTC+0200 Viktor Szakats (harbour syenar.net) + * config/win/watcom.mk + * config/win/xcc.mk + * config/win/icc.mk + * config/win/mingw.mk + * config/win/pocc.mk + * config/win/bcc.mk + * config/win/msvc.mk + ! do not link unicows to harbour dll. it seems a noop + for some compilers, and breaks some others (mingw). + 2012-04-01 11:21 UTC+0200 Viktor Szakats (harbour syenar.net) * config/win/watcom.mk * config/win/xcc.mk diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk index eb9a557825..ea65c26bad 100644 --- a/harbour/config/win/bcc.mk +++ b/harbour/config/win/bcc.mk @@ -107,7 +107,7 @@ DY := ilink32.exe DFLAGS += -q -Gn -C -aa -Tpd -Gi -x $(LIBPATHS) DY_OUT := # NOTE: .lib extension not added to keep line short enough to work on Win9x/ME -DLIBS := $(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS) cw32mt import32 +DLIBS := $(HB_USER_LIBS) $(LIBS) $(SYSLIBS) cw32mt import32 # NOTE: The empty line directly before 'endef' HAVE TO exist! define dynlib_object diff --git a/harbour/config/win/icc.mk b/harbour/config/win/icc.mk index 194cf63156..492241e696 100644 --- a/harbour/config/win/icc.mk +++ b/harbour/config/win/icc.mk @@ -55,7 +55,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR DY := $(LD) DFLAGS += -nologo -dll -subsystem:console $(LIBPATHS) DY_OUT := $(LD_OUT) -DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) +DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) # NOTE: The empty line directly before 'endef' HAVE TO exist! define dynlib_object diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk index af1f040eb8..045cda2cdf 100644 --- a/harbour/config/win/mingw.mk +++ b/harbour/config/win/mingw.mk @@ -119,7 +119,7 @@ AR_RULE = $(create_library) DY := $(CC) DFLAGS += -shared $(LIBPATHS) DY_OUT := $(LD_OUT) -DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),-l$(lib)) +DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) # NOTE: The empty line directly before 'endef' HAVE TO exist! define dynlib_object diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk index 3f6054db69..9560b27681 100644 --- a/harbour/config/win/msvc.mk +++ b/harbour/config/win/msvc.mk @@ -88,7 +88,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR DY := $(LD) DFLAGS += -nologo -dll -subsystem:console $(LIBPATHS) DY_OUT := $(LD_OUT) -DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) +DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) # NOTE: The empty line directly before 'endef' HAVE TO exist! define dynlib_object diff --git a/harbour/config/win/pocc.mk b/harbour/config/win/pocc.mk index 7baeb38666..340e954b57 100644 --- a/harbour/config/win/pocc.mk +++ b/harbour/config/win/pocc.mk @@ -53,7 +53,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^ DY := $(LD) DFLAGS += -nologo -dll $(LIBPATHS) DY_OUT := $(LD_OUT) -DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) +DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) # NOTE: The empty line directly before 'endef' HAVE TO exist! define dynlib_object diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk index d7010c2d78..f0482057e0 100644 --- a/harbour/config/win/watcom.mk +++ b/harbour/config/win/watcom.mk @@ -74,7 +74,6 @@ DFLAGS += OP quiet SYS nt_dll DY_OUT := DLIBS := $(foreach lib,$(HB_USER_LIBS),$(lib)) DLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)) -DLIBS += $(foreach lib,$(3RDLIBS),$(3RDLIB_DIR)/$(lib)) DLIBS += $(foreach lib,$(SYSLIBS),$(lib)) DLIBS := $(strip $(DLIBS)) diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk index 844318fb48..bed9c25349 100644 --- a/harbour/config/win/xcc.mk +++ b/harbour/config/win/xcc.mk @@ -56,7 +56,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^ DY := $(LD) DFLAGS += -nologo -dll -noexpobj $(LIBPATHS) DY_OUT := $(LD_OUT) -DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) +DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT)) ifeq ($(HB_SHELL),sh) DYNFIX = && mv $(DYN_DIR)/$(@:.dll=.LIB) $(LIB_DIR)/$(@:.dll=.lib)