2016-06-30 11:42 UTC+0200 Viktor Szakats (vszakats users.noreply.gith…

…ub.com) * bin/commit.hb - config/libbin.mk * config/win/bcc.mk * config/win/icc.mk * config/win/mingw.mk * config/win/msvc.mk * config/win/pocc.mk * config/win/tcc.mk * config/win/watcom.mk * config/win/xcc.mk * Makefile - Deleted GNU Make bits that were present for integrated unicows support. It's unlikely that the answer for any future problem would be to add 3rd party library binaries to the source repository.
vszakats · Jun 30, 2016 · 772d099 · 772d099
1 parent 9ba58cf
commit 772d099
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 56 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -5,6 +5,23 @@
      git log --pretty=medium --no-merges --date=iso --abbrev-commit HEAD~50..HEAD
    See license at the end of file. */
 
+2016-06-30 11:42 UTC+0200 Viktor Szakats (vszakats users.noreply.github.com)
+  * bin/commit.hb
+  - config/libbin.mk
+  * config/win/bcc.mk
+  * config/win/icc.mk
+  * config/win/mingw.mk
+  * config/win/msvc.mk
+  * config/win/pocc.mk
+  * config/win/tcc.mk
+  * config/win/watcom.mk
+  * config/win/xcc.mk
+  * Makefile
+    - Deleted GNU Make bits that were present for integrated
+      unicows support. It's unlikely that the answer for any
+      future problem would be to add 3rd party library binaries
+      to the source repository.
+
 2016-06-30 00:33 UTC+0200 Viktor Szakats (vszakats users.noreply.github.com)
   * contrib/hbtinymt/3rd/tinymt/tinymt.dif
   * contrib/hbtinymt/3rd/tinymt/tinymt.hbp
@@ -44,7 +61,7 @@
     ; unused 3RDLIB_DIR, 3RDLIBS, 3RDLIBS_DYN macros, 'lib/3rd'
       references and 'config/libbin.mk' kept in the GNU Make system,
       they may be removed in a subsequent commit or left there
-      for some future use.
+      for some future use. [DELETED]
 
   * README.md
     * remove unicows and another Win9x specific reference

diff --git a/Makefile b/Makefile
@@ -4,10 +4,6 @@ include $(ROOT)config/global.mk
 
 DIRS :=
 
-ifneq ($(wildcard lib/3rd/$(HB_PLATFORM)/$(HB_COMPILER)),)
-   DIRS += lib/3rd/$(HB_PLATFORM)/$(HB_COMPILER)
-endif
-
 ifeq ($(HB_BUILD_PARTS),compiler)
 
    DIRS += \

diff --git a/bin/commit.hb b/bin/commit.hb
@@ -648,7 +648,6 @@ STATIC FUNCTION CheckFile( cName, /* @ */ aErr, lApplyFixes, cLocalRoot, lRebase
       "*/hb-charmap.def", ;  /* TOFIX: Use 8.3 name */
       "debian/*", ;
       "package/*", ;
-      "lib/3rd/*", ;
       "contrib/gtqtc/*", ;
       "contrib/hbwin/*", ;
       "contrib/rddads/unixutils.h", ;

diff --git a/config/libbin.mk b/config/libbin.mk
diff --git a/config/win/bcc.mk b/config/win/bcc.mk
@@ -90,15 +90,15 @@ ifeq ($(HB_COMPILER),bcc64)
 else
    LD := ilink32.exe
 endif
-LIBPATHS := $(foreach dir,$(LIB_DIR) $(3RDLIB_DIR),$(subst /,$(BACKSLASH),-L"$(dir)"))
+LIBPATHS := $(foreach dir,$(LIB_DIR),$(subst /,$(BACKSLASH),-L"$(dir)"))
 LDFLAGS += $(LIBPATHS) -Gn -Tpe
 ifeq ($(HB_COMPILER),bcc64)
    LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) c0x64.obj $(filter-out %$(RES_EXT),$(^F)), "$(subst /,$(BACKSLASH),$(BIN_DIR)/$@)", nul, $(LDLIBS) cw64mt import64,, $(filter %$(RES_EXT),$(^F)) $(LDSTRIP)
 else
    LD_RULE = $(LD) $(LDFLAGS) $(HB_LDFLAGS) $(HB_USER_LDFLAGS) c0x32.obj $(filter-out %$(RES_EXT),$(^F)), "$(subst /,$(BACKSLASH),$(BIN_DIR)/$@)", nul, $(LDLIBS) cw32mt import32,, $(filter %$(RES_EXT),$(^F)) $(LDSTRIP)
 endif
 
-LDLIBS := $(strip $(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS))
+LDLIBS := $(strip $(HB_USER_LIBS) $(LIBS) $(SYSLIBS))
 
 ifeq ($(HB_COMPILER),bcc64)
    AR := tlib64.exe
@@ -149,9 +149,9 @@ DY_OUT :=
 # NOTE: .lib extension not added to keep line short enough to work on Win9x/ME
 #       and to remain compatible with both bcc64 and bcc 32-bit.
 ifeq ($(HB_COMPILER),bcc64)
-   DLIBS := $(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS) cw64mt import64
+   DLIBS := $(HB_USER_LIBS) $(LIBS) $(SYSLIBS) cw64mt import64
 else
-   DLIBS := $(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS) cw32mt import32
+   DLIBS := $(HB_USER_LIBS) $(LIBS) $(SYSLIBS) cw32mt import32
 endif
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!

diff --git a/config/win/icc.mk b/config/win/icc.mk
@@ -40,8 +40,8 @@ endif
 LD := xilink.exe
 LD_OUT := -out:
 
-LIBPATHS := $(foreach dir,$(LIB_DIR) $(3RDLIB_DIR),-libpath:$(dir))
-LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LIBPATHS := $(foreach dir,$(LIB_DIR),-libpath:$(dir))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 LDFLAGS += -nologo $(LIBPATHS)
 
@@ -51,7 +51,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/config/win/mingw.mk b/config/win/mingw.mk
@@ -12,8 +12,6 @@ OBJ_EXT := .o
 LIB_PREF := lib
 LIB_EXT := .a
 
-3RDLIBS_DYN := $(3RDLIBS)
-
 CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCSUFFIX)
 CC_IN :=
 CC_OUT := -o
@@ -141,8 +139,8 @@ endif
 LD := $(CC)
 LD_OUT := -o$(subst x,x, )
 
-LIBPATHS := $(foreach dir,$(LIB_DIR) $(3RDLIB_DIR),-L$(dir))
-LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),-l$(lib))
+LIBPATHS := $(foreach dir,$(LIB_DIR),-L$(dir))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
 
 # Add the standard C entry
 ifneq ($(HB_LINKING_RTL),)
@@ -171,7 +169,7 @@ AR_RULE = $(create_library)
 DY := $(CC)
 DFLAGS += -shared $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS_DYN) $(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/config/win/msvc.mk b/config/win/msvc.mk
@@ -103,8 +103,8 @@ LD := link.exe
 # endif
 LD_OUT := -out:
 
-LIBPATHS := $(foreach dir,$(LIB_DIR) $(3RDLIB_DIR),-libpath:$(dir))
-LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LIBPATHS := $(foreach dir,$(LIB_DIR),-libpath:$(dir))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 LDFLAGS += -nologo -subsystem:console $(LIBPATHS)
 
@@ -114,7 +114,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/config/win/pocc.mk b/config/win/pocc.mk
@@ -51,8 +51,8 @@ RCFLAGS += -I. -I$(TOP) -I$(HB_HOST_INC) -c65001
 LD := polink.exe
 LD_OUT := -out:
 
-LIBPATHS := $(foreach dir,$(LIB_DIR) $(3RDLIB_DIR),-libpath:$(dir))
-LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LIBPATHS := $(foreach dir,$(LIB_DIR),-libpath:$(dir))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 LDFLAGS += -subsystem:console
 LDFLAGS += $(LIBPATHS)
@@ -63,7 +63,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/config/win/tcc.mk b/config/win/tcc.mk
@@ -35,8 +35,8 @@ endif
 LD := $(CC)
 LD_OUT := -o$(subst x,x, )
 
-LIBPATHS := $(foreach dir,$(LIB_DIR) $(3RDLIB_DIR),-L$(dir))
-LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),-l$(lib))
+LIBPATHS := $(foreach dir,$(LIB_DIR),-L$(dir))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
 
 # Add the standard C entry
 ifneq ($(HB_LINKING_RTL),)
@@ -53,7 +53,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $^ ) |
 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))
 DY_RULE = $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS)
 
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/config/win/watcom.mk b/config/win/watcom.mk
@@ -60,15 +60,13 @@ LDFLAGS += SYS nt
 
 LDLIBS := $(foreach lib,$(HB_USER_LIBS),$(lib))
 LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
-LDLIBS += $(foreach lib,$(3RDLIBS),$(3RDLIB_DIR)/$(lib))
 LDLIBS += $(foreach lib,$(SYSLIBS),$(lib))
 
 DY := $(LD)
 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/config/win/xcc.mk b/config/win/xcc.mk
@@ -42,8 +42,8 @@ RCFLAGS += -I. -I$(TOP) -I$(HB_HOST_INC) -c65001
 LD := xLink.exe
 LD_OUT := -out:
 
-LIBPATHS := $(foreach dir,$(LIB_DIR) $(3RDLIB_DIR),-libpath:$(dir))
-LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+LIBPATHS := $(foreach dir,$(LIB_DIR),-libpath:$(dir))
+LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 LDFLAGS += $(LIBPATHS)
 
@@ -53,7 +53,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)