From effd14c344f68b3a4df3770af310af80d24da69e Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 26 Jun 2007 21:55:46 +0000
Subject: [PATCH] 2007-06-26 23:55 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/bin/hb-func.sh   * harbour/harbour.spec 
    * added description for -L<path> in hb* scripts

  * harbour/include/hbapicls.h
  * harbour/source/vm/classes.c
    * changed hb_objSendMsg() and hb_objSendMessage() to return
      hb_stackReturnItem() - xHarbour users asked about it. It does
      not change binary compatibility with existing code.

  * harbour/common.mak
    * replaced some hard coded values like file extensions with variables
      for future use on other platforms

  * harbour/contrib/mysql/mysql.c
    * changed code to not use non standard function filelength()
      and optimized

  * harbour/source/compiler/cmdcheck.c
    * recognize --version on platforms where '-' is option separator

  * harbour/source/compiler/hbusage.c
    * changed syntax description from:
         Syntax:  harbour <file[s][.prg]> [options]
      to:
         Syntax:  harbour <file[s][.prg]|@file> [options]
---
 harbour/ChangeLog                  |   28 +
 harbour/bin/hb-func.sh             |    1 +
 harbour/common.mak                 | 1125 ++++++++++++++--------------
 harbour/contrib/mysql/mysql.c      |   64 +-
 harbour/harbour.spec               |    1 +
 harbour/include/hbapicls.h         |    4 +-
 harbour/source/compiler/cmdcheck.c |   17 +
 harbour/source/compiler/hbusage.c  |    2 +-
 harbour/source/vm/classes.c        |    8 +-
 9 files changed, 660 insertions(+), 590 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d58c4a3b32..a67719df49 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,34 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-06-26 23:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+  * harbour/harbour.spec
+    * added description for -L<path> in hb* scripts
+
+  * harbour/include/hbapicls.h
+  * harbour/source/vm/classes.c
+    * changed hb_objSendMsg() and hb_objSendMessage() to return
+      hb_stackReturnItem() - xHarbour users asked about it. It does
+      not change binary compatibility with existing code.
+
+  * harbour/common.mak
+    * replaced some hard coded values like file extensions with variables
+      for future use on other platforms
+
+  * harbour/contrib/mysql/mysql.c
+    * changed code to not use non standard function filelength()
+      and optimized
+
+  * harbour/source/compiler/cmdcheck.c
+    * recognize --version on platforms where '-' is option separator
+
+  * harbour/source/compiler/hbusage.c
+    * changed syntax description from:
+         Syntax:  harbour <file[s][.prg]> [options]
+      to:
+         Syntax:  harbour <file[s][.prg]|@file> [options]
+
 2007-06-26 22:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/gttrm/gttrm.c
     * use separate trnaslation tables for dispout() and dispbox() like
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 50df1bdd5a..ac14668488 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -190,6 +190,7 @@ if [ \$# = 0 ]; then
     -xbgtk              # link with xbgtk library (xBase GTK+ interface)
     -hwgui              # link with HWGUI library (GTK+ interface)
     -l<libname>         # link with <libname> library
+    -L<libpath>         # additional path to search for libraries
     -fmstat             # link with the memory statistics lib
     -nofmstat           # do not link with the memory statistics lib (default)
     -[no]strip          # strip (no strip) binaries
diff --git a/harbour/common.mak b/harbour/common.mak
index ea7ef0a1d3..ab3bddc654 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -17,6 +17,31 @@
 
 #**********************************************************
 
+#
+# binary file suffixes and prefixes
+#
+!ifndef OBJEXT
+OBJEXT=".obj"
+!endif
+
+!ifndef EXEEXT
+EXEEXT=".exe"
+!endif
+
+!ifndef DLLEXT
+DLLEXT=".dll"
+!endif
+
+!ifndef LIBEXT
+LIBEXT=".lib"
+!endif
+
+!ifndef LIBPREF
+LIBPREF=""
+!endif
+
+#**********************************************************
+
 #
 # Directory macros. These should never have to change.
 #
@@ -135,47 +160,47 @@ ALL_SRC_DIRS     = $(ALL_SRC_DIRS_TMP: =)
 # Macros to define our library and executable names
 #
 
-COMMON_LIB   = $(LIB_DIR)\common.lib
-COMPILER_LIB = $(LIB_DIR)\compiler.lib
-PP_LIB       = $(LIB_DIR)\pp.lib
-VM_LIB       = $(LIB_DIR)\vm.lib
-RTL_LIB      = $(LIB_DIR)\rtl.lib
-MACRO_LIB    = $(LIB_DIR)\macro.lib
-DEBUG_LIB    = $(LIB_DIR)\debug.lib
-LANG_LIB     = $(LIB_DIR)\lang.lib
-CODEPAGE_LIB = $(LIB_DIR)\codepage.lib
-PCRE_LIB     = $(LIB_DIR)\hbpcre.lib
-RDD_LIB      = $(LIB_DIR)\rdd.lib
-NULSYS_LIB   = $(LIB_DIR)\nulsys.lib
-DBFNTX_LIB   = $(LIB_DIR)\dbfntx.lib
-DBFCDX_LIB   = $(LIB_DIR)\dbfcdx.lib
-DBFFPT_LIB   = $(LIB_DIR)\dbffpt.lib
-HBSIX_LIB    = $(LIB_DIR)\hbsix.lib
-HSX_LIB      = $(LIB_DIR)\hsx.lib
-USRRDD_LIB   = $(LIB_DIR)\usrrdd.lib
+COMMON_LIB   = $(LIB_DIR)\$(LIBPREF)common$(LIBEXT)
+COMPILER_LIB = $(LIB_DIR)\$(LIBPREF)compiler$(LIBEXT)
+PP_LIB       = $(LIB_DIR)\$(LIBPREF)pp$(LIBEXT)
+VM_LIB       = $(LIB_DIR)\$(LIBPREF)vm$(LIBEXT)
+RTL_LIB      = $(LIB_DIR)\$(LIBPREF)rtl$(LIBEXT)
+MACRO_LIB    = $(LIB_DIR)\$(LIBPREF)macro$(LIBEXT)
+DEBUG_LIB    = $(LIB_DIR)\$(LIBPREF)debug$(LIBEXT)
+LANG_LIB     = $(LIB_DIR)\$(LIBPREF)lang$(LIBEXT)
+CODEPAGE_LIB = $(LIB_DIR)\$(LIBPREF)codepage$(LIBEXT)
+PCRE_LIB     = $(LIB_DIR)\$(LIBPREF)hbpcre$(LIBEXT)
+RDD_LIB      = $(LIB_DIR)\$(LIBPREF)rdd$(LIBEXT)
+NULSYS_LIB   = $(LIB_DIR)\$(LIBPREF)nulsys$(LIBEXT)
+DBFNTX_LIB   = $(LIB_DIR)\$(LIBPREF)dbfntx$(LIBEXT)
+DBFCDX_LIB   = $(LIB_DIR)\$(LIBPREF)dbfcdx$(LIBEXT)
+DBFFPT_LIB   = $(LIB_DIR)\$(LIBPREF)dbffpt$(LIBEXT)
+HBSIX_LIB    = $(LIB_DIR)\$(LIBPREF)hbsix$(LIBEXT)
+HSX_LIB      = $(LIB_DIR)\$(LIBPREF)hsx$(LIBEXT)
+USRRDD_LIB   = $(LIB_DIR)\$(LIBPREF)usrrdd$(LIBEXT)
 
-GTCGI_LIB    = $(LIB_DIR)\gtcgi.lib
-GTDOS_LIB    = $(LIB_DIR)\gtdos.lib
-GTPCA_LIB    = $(LIB_DIR)\gtpca.lib
-GTSTD_LIB    = $(LIB_DIR)\gtstd.lib
-GTWIN_LIB    = $(LIB_DIR)\gtwin.lib
-GTWVT_LIB    = $(LIB_DIR)\gtwvt.lib
-GTGUI_LIB    = $(LIB_DIR)\gtgui.lib
+GTCGI_LIB    = $(LIB_DIR)\$(LIBPREF)gtcgi$(LIBEXT)
+GTDOS_LIB    = $(LIB_DIR)\$(LIBPREF)gtdos$(LIBEXT)
+GTPCA_LIB    = $(LIB_DIR)\$(LIBPREF)gtpca$(LIBEXT)
+GTSTD_LIB    = $(LIB_DIR)\$(LIBPREF)gtstd$(LIBEXT)
+GTWIN_LIB    = $(LIB_DIR)\$(LIBPREF)gtwin$(LIBEXT)
+GTWVT_LIB    = $(LIB_DIR)\$(LIBPREF)gtwvt$(LIBEXT)
+GTGUI_LIB    = $(LIB_DIR)\$(LIBPREF)gtgui$(LIBEXT)
 
-HARBOUR_EXE  = $(BIN_DIR)\harbour.exe
+HARBOUR_EXE  = $(BIN_DIR)\harbour$(EXEEXT)
 # required (intermediate) utility
 #     to generate pptable.c
-HBPPGEN_EXE  = $(BIN_DIR)\ppgen.exe
-HBPP_EXE     = $(BIN_DIR)\hbpp.exe
-HBPPTEST_EXE = $(BIN_DIR)\hbpptest.exe
-HBRUN_EXE    = $(BIN_DIR)\hbrun.exe
-HBTEST_EXE   = $(BIN_DIR)\hbtest.exe
-HBDOC_EXE    = $(BIN_DIR)\hbdoc.exe
-HBMAKE_EXE   = $(BIN_DIR)\hbmake.exe
-HBVER_EXE    = $(BIN_DIR)\hbverfix.exe
+HBPPGEN_EXE  = $(BIN_DIR)\ppgen$(EXEEXT)
+HBPP_EXE     = $(BIN_DIR)\hbpp$(EXEEXT)
+HBPPTEST_EXE = $(BIN_DIR)\hbpptest$(EXEEXT)
+HBRUN_EXE    = $(BIN_DIR)\hbrun$(EXEEXT)
+HBTEST_EXE   = $(BIN_DIR)\hbtest$(EXEEXT)
+HBDOC_EXE    = $(BIN_DIR)\hbdoc$(EXEEXT)
+HBMAKE_EXE   = $(BIN_DIR)\hbmake$(EXEEXT)
+HBVER_EXE    = $(BIN_DIR)\hbverfix$(EXEEXT)
 
-HARBOUR_DLL  = $(BIN_DIR)\harbour-$(CC_DIRNAME).dll
-HBTESTDLL_EXE= $(BIN_DIR)\hbtest-dll.exe
+HARBOUR_DLL  = $(BIN_DIR)\harbour-$(CC_DIRNAME)$(DLLEXT)
+HBTESTDLL_EXE= $(BIN_DIR)\hbtest-dll$(EXEEXT)
 
 #**********************************************************
 
@@ -194,7 +219,7 @@ HB_GT_LIBS = \
 !ifndef HB_GT_LIB
 HB_GT_LIB = $(GTWIN_LIB)
 !else
-HB_GT_LIB = $(LIB_DIR)\$(HB_GT_LIB).lib
+HB_GT_LIB = $(LIB_DIR)\$(LIBPREF)$(HB_GT_LIB)$(LIBEXT)
 !endif
 
 #**********************************************************
@@ -231,103 +256,103 @@ STANDARD_STATIC_HBLIBS = \
 #**********************************************************
 
 COMMON_LIB_OBJS = \
-    $(OBJ_DIR)\expropt1.obj \
-    $(OBJ_DIR)\expropt2.obj \
-    $(OBJ_DIR)\hbarch.obj   \
-    $(OBJ_DIR)\hbfhnd.obj   \
-    $(OBJ_DIR)\hbfsapi.obj  \
-    $(OBJ_DIR)\hbgete.obj   \
-    $(OBJ_DIR)\hbhash.obj   \
-    $(OBJ_DIR)\hbdate.obj   \
-    $(OBJ_DIR)\hbstr.obj    \
-    $(OBJ_DIR)\hbtrace.obj  \
-    $(OBJ_DIR)\hbver.obj    \
-    $(OBJ_DIR)\hbverdsp.obj \
-    $(OBJ_DIR)\reserved.obj
+    $(OBJ_DIR)\expropt1$(OBJEXT) \
+    $(OBJ_DIR)\expropt2$(OBJEXT) \
+    $(OBJ_DIR)\hbarch$(OBJEXT)   \
+    $(OBJ_DIR)\hbfhnd$(OBJEXT)   \
+    $(OBJ_DIR)\hbfsapi$(OBJEXT)  \
+    $(OBJ_DIR)\hbgete$(OBJEXT)   \
+    $(OBJ_DIR)\hbhash$(OBJEXT)   \
+    $(OBJ_DIR)\hbdate$(OBJEXT)   \
+    $(OBJ_DIR)\hbstr$(OBJEXT)    \
+    $(OBJ_DIR)\hbtrace$(OBJEXT)  \
+    $(OBJ_DIR)\hbver$(OBJEXT)    \
+    $(OBJ_DIR)\hbverdsp$(OBJEXT) \
+    $(OBJ_DIR)\reserved$(OBJEXT)
 
 #**********************************************************
 
 PP_LIB_OBJS = \
-    $(OBJ_DIR)\pptable.obj \
-    $(OBJ_DIR)\ppcore.obj  \
-    $(OBJ_DIR)\pplib.obj   \
-    $(OBJ_DIR)\pplib2.obj   \
-    $(OBJ_DIR)\pplib3.obj   \
+    $(OBJ_DIR)\pptable$(OBJEXT)  \
+    $(OBJ_DIR)\ppcore$(OBJEXT)   \
+    $(OBJ_DIR)\pplib$(OBJEXT)    \
+    $(OBJ_DIR)\pplib2$(OBJEXT)   \
+    $(OBJ_DIR)\pplib3$(OBJEXT)   \
 
 #**********************************************************
 
 COMPILER_LIB_OBJS = \
-    $(OBJ_DIR)\hbmain.obj   \
-    $(OBJ_DIR)\harboury.obj \
-    $(OBJ_DIR)\complex.obj  \
-    $(OBJ_DIR)\cmdcheck.obj \
-    $(OBJ_DIR)\hbcomp.obj   \
-    $(OBJ_DIR)\hbcmplib.obj \
-    $(OBJ_DIR)\hbdbginf.obj \
-    $(OBJ_DIR)\hbdead.obj   \
-    $(OBJ_DIR)\hbstripl.obj \
-    $(OBJ_DIR)\hbusage.obj  \
-    $(OBJ_DIR)\hbident.obj  \
-    $(OBJ_DIR)\hbgenerr.obj \
-    $(OBJ_DIR)\hblbl.obj    \
-    $(OBJ_DIR)\hbpcode.obj  \
-    $(OBJ_DIR)\hbfunchk.obj \
-    $(OBJ_DIR)\hbfix.obj    \
-    $(OBJ_DIR)\hbopt.obj    \
-    $(OBJ_DIR)\ppcomp.obj   \
-    $(OBJ_DIR)\genc.obj     \
-    $(OBJ_DIR)\gencc.obj    \
-    $(OBJ_DIR)\gencli.obj   \
-    $(OBJ_DIR)\gencobj.obj  \
-    $(OBJ_DIR)\genobj32.obj \
-    $(OBJ_DIR)\genjava.obj  \
-    $(OBJ_DIR)\genhrb.obj   \
-    $(OBJ_DIR)\expropta.obj \
-    $(OBJ_DIR)\exproptb.obj \
+    $(OBJ_DIR)\hbmain$(OBJEXT)   \
+    $(OBJ_DIR)\harboury$(OBJEXT) \
+    $(OBJ_DIR)\complex$(OBJEXT)  \
+    $(OBJ_DIR)\cmdcheck$(OBJEXT) \
+    $(OBJ_DIR)\hbcomp$(OBJEXT)   \
+    $(OBJ_DIR)\hbcmplib$(OBJEXT) \
+    $(OBJ_DIR)\hbdbginf$(OBJEXT) \
+    $(OBJ_DIR)\hbdead$(OBJEXT)   \
+    $(OBJ_DIR)\hbstripl$(OBJEXT) \
+    $(OBJ_DIR)\hbusage$(OBJEXT)  \
+    $(OBJ_DIR)\hbident$(OBJEXT)  \
+    $(OBJ_DIR)\hbgenerr$(OBJEXT) \
+    $(OBJ_DIR)\hblbl$(OBJEXT)    \
+    $(OBJ_DIR)\hbpcode$(OBJEXT)  \
+    $(OBJ_DIR)\hbfunchk$(OBJEXT) \
+    $(OBJ_DIR)\hbfix$(OBJEXT)    \
+    $(OBJ_DIR)\hbopt$(OBJEXT)    \
+    $(OBJ_DIR)\ppcomp$(OBJEXT)   \
+    $(OBJ_DIR)\genc$(OBJEXT)     \
+    $(OBJ_DIR)\gencc$(OBJEXT)    \
+    $(OBJ_DIR)\gencli$(OBJEXT)   \
+    $(OBJ_DIR)\gencobj$(OBJEXT)  \
+    $(OBJ_DIR)\genobj32$(OBJEXT) \
+    $(OBJ_DIR)\genjava$(OBJEXT)  \
+    $(OBJ_DIR)\genhrb$(OBJEXT)   \
+    $(OBJ_DIR)\expropta$(OBJEXT) \
+    $(OBJ_DIR)\exproptb$(OBJEXT) \
 
 #**********************************************************
 
 # VM Objects common for STATIC and SHARED library
 VM_COMMON_LIB_OBJS = \
-    $(OBJ_DIR)\arrays.obj   \
-    $(OBJ_DIR)\arrayshb.obj \
-    $(OBJ_DIR)\asort.obj    \
-    $(OBJ_DIR)\break.obj    \
-    $(OBJ_DIR)\classes.obj  \
-    $(OBJ_DIR)\cmdarg.obj   \
-    $(OBJ_DIR)\codebloc.obj \
-    $(OBJ_DIR)\debug.obj    \
-    $(OBJ_DIR)\dynlibhb.obj \
-    $(OBJ_DIR)\dynsym.obj   \
-    $(OBJ_DIR)\estack.obj   \
-    $(OBJ_DIR)\eval.obj     \
-    $(OBJ_DIR)\evalhb.obj   \
-    $(OBJ_DIR)\extend.obj   \
-    $(OBJ_DIR)\fm.obj       \
-    $(OBJ_DIR)\garbage.obj  \
-    $(OBJ_DIR)\hashes.obj   \
-    $(OBJ_DIR)\hashfunc.obj \
-    $(OBJ_DIR)\hvm.obj      \
-    $(OBJ_DIR)\initexit.obj \
-    $(OBJ_DIR)\initsymb.obj \
-    $(OBJ_DIR)\itemapi.obj  \
-    $(OBJ_DIR)\macro.obj    \
-    $(OBJ_DIR)\memvars.obj  \
-    $(OBJ_DIR)\memvclip.obj \
-    $(OBJ_DIR)\pcount.obj   \
-    $(OBJ_DIR)\proc.obj     \
-    $(OBJ_DIR)\pvalue.obj   \
-    $(OBJ_DIR)\runner.obj   \
-    $(OBJ_DIR)\harbinit.obj \
+    $(OBJ_DIR)\arrays$(OBJEXT)   \
+    $(OBJ_DIR)\arrayshb$(OBJEXT) \
+    $(OBJ_DIR)\asort$(OBJEXT)    \
+    $(OBJ_DIR)\break$(OBJEXT)    \
+    $(OBJ_DIR)\classes$(OBJEXT)  \
+    $(OBJ_DIR)\cmdarg$(OBJEXT)   \
+    $(OBJ_DIR)\codebloc$(OBJEXT) \
+    $(OBJ_DIR)\debug$(OBJEXT)    \
+    $(OBJ_DIR)\dynlibhb$(OBJEXT) \
+    $(OBJ_DIR)\dynsym$(OBJEXT)   \
+    $(OBJ_DIR)\estack$(OBJEXT)   \
+    $(OBJ_DIR)\eval$(OBJEXT)     \
+    $(OBJ_DIR)\evalhb$(OBJEXT)   \
+    $(OBJ_DIR)\extend$(OBJEXT)   \
+    $(OBJ_DIR)\fm$(OBJEXT)       \
+    $(OBJ_DIR)\garbage$(OBJEXT)  \
+    $(OBJ_DIR)\hashes$(OBJEXT)   \
+    $(OBJ_DIR)\hashfunc$(OBJEXT) \
+    $(OBJ_DIR)\hvm$(OBJEXT)      \
+    $(OBJ_DIR)\initexit$(OBJEXT) \
+    $(OBJ_DIR)\initsymb$(OBJEXT) \
+    $(OBJ_DIR)\itemapi$(OBJEXT)  \
+    $(OBJ_DIR)\macro$(OBJEXT)    \
+    $(OBJ_DIR)\memvars$(OBJEXT)  \
+    $(OBJ_DIR)\memvclip$(OBJEXT) \
+    $(OBJ_DIR)\pcount$(OBJEXT)   \
+    $(OBJ_DIR)\proc$(OBJEXT)     \
+    $(OBJ_DIR)\pvalue$(OBJEXT)   \
+    $(OBJ_DIR)\runner$(OBJEXT)   \
+    $(OBJ_DIR)\harbinit$(OBJEXT) \
 
 # Specific VM Objects for building STATIC library
 VM_STATIC_LIB_OBJS = \
-    $(OBJ_DIR)\mainstd.obj  \
-    $(OBJ_DIR)\mainwin.obj
+    $(OBJ_DIR)\mainstd$(OBJEXT)  \
+    $(OBJ_DIR)\mainwin$(OBJEXT)
 
 # Specific VM Objects for building SHARED (DLL) library
 VM_SHARED_LIB_OBJS = \
-    $(OBJ_DIR)\maindllh.obj \
+    $(OBJ_DIR)\maindllh$(OBJEXT) \
 
 # All VM Objects for building STATIC library
 VM_LIB_OBJS = $(VM_COMMON_LIB_OBJS) $(VM_STATIC_LIB_OBJS)
@@ -336,474 +361,474 @@ VM_LIB_OBJS = $(VM_COMMON_LIB_OBJS) $(VM_STATIC_LIB_OBJS)
 VM_DLL_OBJS = $(VM_COMMON_LIB_OBJS) $(VM_SHARED_LIB_OBJS)
 
 DISABLED_VM_OBJS = \
-    $(OBJ_DIR)\maindllp.obj \
-    $(OBJ_DIR)\maindll.obj  \
+    $(OBJ_DIR)\maindllp$(OBJEXT) \
+    $(OBJ_DIR)\maindll$(OBJEXT)  \
 
 #**********************************************************
 
 RTL_LIB_OBJS = \
-    $(OBJ_DIR)\abs.obj      \
-    $(OBJ_DIR)\accept.obj   \
-    $(OBJ_DIR)\ampm.obj     \
-    $(OBJ_DIR)\at.obj       \
-    $(OBJ_DIR)\binnum.obj   \
-    $(OBJ_DIR)\binnumx.obj  \
-    $(OBJ_DIR)\box.obj      \
-    $(OBJ_DIR)\cdpapi.obj   \
-    $(OBJ_DIR)\chrasc.obj   \
-    $(OBJ_DIR)\colorind.obj \
-    $(OBJ_DIR)\console.obj  \
-    $(OBJ_DIR)\copyfile.obj \
-    $(OBJ_DIR)\datec.obj    \
-    $(OBJ_DIR)\dates.obj    \
-    $(OBJ_DIR)\dateshb.obj  \
-    $(OBJ_DIR)\datesx.obj   \
-    $(OBJ_DIR)\defpath.obj  \
-    $(OBJ_DIR)\descend.obj  \
-    $(OBJ_DIR)\dirdrive.obj \
-    $(OBJ_DIR)\direct.obj   \
-    $(OBJ_DIR)\diskspac.obj \
-    $(OBJ_DIR)\disksphb.obj \
-    $(OBJ_DIR)\do.obj       \
-    $(OBJ_DIR)\empty.obj    \
-    $(OBJ_DIR)\errorapi.obj \
-    $(OBJ_DIR)\errorint.obj \
-    $(OBJ_DIR)\file.obj     \
-    $(OBJ_DIR)\filehb.obj   \
-    $(OBJ_DIR)\filesys.obj  \
-    $(OBJ_DIR)\fkmax.obj    \
-    $(OBJ_DIR)\fnsplit.obj  \
-    $(OBJ_DIR)\fserror.obj  \
-    $(OBJ_DIR)\fssize.obj   \
-    $(OBJ_DIR)\fstemp.obj   \
-    $(OBJ_DIR)\gete.obj     \
-    $(OBJ_DIR)\gt.obj       \
-    $(OBJ_DIR)\gtapi.obj    \
-    $(OBJ_DIR)\gtapiu.obj   \
-    $(OBJ_DIR)\gtclip.obj   \
-    $(OBJ_DIR)\gtfunc.obj   \
-    $(OBJ_DIR)\gtsys.obj    \
-    $(OBJ_DIR)\gttone.obj   \
-    $(OBJ_DIR)\gx.obj       \
-    $(OBJ_DIR)\hardcr.obj   \
-    $(OBJ_DIR)\hbcrc.obj    \
-    $(OBJ_DIR)\hbmd5.obj    \
-    $(OBJ_DIR)\hbffind.obj  \
-    $(OBJ_DIR)\hbgtcore.obj \
-    $(OBJ_DIR)\hbinet.obj   \
-    $(OBJ_DIR)\hbrandom.obj \
-    $(OBJ_DIR)\hbregex.obj  \
-    $(OBJ_DIR)\hbregexc.obj \
-    $(OBJ_DIR)\hbtoken.obj  \
-    $(OBJ_DIR)\idle.obj     \
-    $(OBJ_DIR)\inkey.obj    \
-    $(OBJ_DIR)\is.obj       \
-    $(OBJ_DIR)\isprint.obj  \
-    $(OBJ_DIR)\itemseri.obj \
-    $(OBJ_DIR)\langapi.obj  \
-    $(OBJ_DIR)\left.obj     \
-    $(OBJ_DIR)\len.obj      \
-    $(OBJ_DIR)\lennum.obj   \
-    $(OBJ_DIR)\math.obj     \
-    $(OBJ_DIR)\maxrow.obj   \
-    $(OBJ_DIR)\memofile.obj \
-    $(OBJ_DIR)\minmax.obj   \
-    $(OBJ_DIR)\mlcfunc.obj  \
-    $(OBJ_DIR)\mod.obj      \
-    $(OBJ_DIR)\mouseapi.obj \
-    $(OBJ_DIR)\mousex.obj   \
-    $(OBJ_DIR)\mtran.obj    \
-    $(OBJ_DIR)\natmsg.obj   \
-    $(OBJ_DIR)\net.obj      \
-    $(OBJ_DIR)\oemansi.obj  \
-    $(OBJ_DIR)\oldbox.obj   \
-    $(OBJ_DIR)\oldclear.obj \
-    $(OBJ_DIR)\pad.obj      \
-    $(OBJ_DIR)\padc.obj     \
-    $(OBJ_DIR)\padl.obj     \
-    $(OBJ_DIR)\padr.obj     \
-    $(OBJ_DIR)\philes.obj   \
-    $(OBJ_DIR)\philes53.obj \
-    $(OBJ_DIR)\philesx.obj  \
-    $(OBJ_DIR)\rat.obj      \
-    $(OBJ_DIR)\replic.obj   \
-    $(OBJ_DIR)\right.obj    \
-    $(OBJ_DIR)\round.obj    \
-    $(OBJ_DIR)\run.obj      \
-    $(OBJ_DIR)\samples.obj  \
-    $(OBJ_DIR)\saverest.obj \
-    $(OBJ_DIR)\scroll.obj   \
-    $(OBJ_DIR)\seconds.obj  \
-    $(OBJ_DIR)\set.obj      \
-    $(OBJ_DIR)\setcolor.obj \
-    $(OBJ_DIR)\setcurs.obj  \
-    $(OBJ_DIR)\setkey.obj   \
-    $(OBJ_DIR)\setpos.obj   \
-    $(OBJ_DIR)\setposbs.obj \
-    $(OBJ_DIR)\shadow.obj   \
-    $(OBJ_DIR)\soundex.obj  \
-    $(OBJ_DIR)\space.obj    \
-    $(OBJ_DIR)\spfiles.obj  \
-    $(OBJ_DIR)\str.obj      \
-    $(OBJ_DIR)\strpeek.obj  \
-    $(OBJ_DIR)\strcase.obj  \
-    $(OBJ_DIR)\strings.obj  \
-    $(OBJ_DIR)\strmatch.obj \
-    $(OBJ_DIR)\strtran.obj  \
-    $(OBJ_DIR)\strzero.obj  \
-    $(OBJ_DIR)\stuff.obj    \
-    $(OBJ_DIR)\substr.obj   \
-    $(OBJ_DIR)\tone.obj     \
-    $(OBJ_DIR)\trace.obj    \
-    $(OBJ_DIR)\transfrm.obj \
-    $(OBJ_DIR)\trim.obj     \
-    $(OBJ_DIR)\type.obj     \
-    $(OBJ_DIR)\val.obj      \
-    $(OBJ_DIR)\valtostr.obj \
-    $(OBJ_DIR)\valtype.obj  \
-    $(OBJ_DIR)\version.obj  \
-    $(OBJ_DIR)\word.obj     \
-    $(OBJ_DIR)\xhelp.obj    \
-    $(OBJ_DIR)\xsavescr.obj \
+    $(OBJ_DIR)\abs$(OBJEXT)      \
+    $(OBJ_DIR)\accept$(OBJEXT)   \
+    $(OBJ_DIR)\ampm$(OBJEXT)     \
+    $(OBJ_DIR)\at$(OBJEXT)       \
+    $(OBJ_DIR)\binnum$(OBJEXT)   \
+    $(OBJ_DIR)\binnumx$(OBJEXT)  \
+    $(OBJ_DIR)\box$(OBJEXT)      \
+    $(OBJ_DIR)\cdpapi$(OBJEXT)   \
+    $(OBJ_DIR)\chrasc$(OBJEXT)   \
+    $(OBJ_DIR)\colorind$(OBJEXT) \
+    $(OBJ_DIR)\console$(OBJEXT)  \
+    $(OBJ_DIR)\copyfile$(OBJEXT) \
+    $(OBJ_DIR)\datec$(OBJEXT)    \
+    $(OBJ_DIR)\dates$(OBJEXT)    \
+    $(OBJ_DIR)\dateshb$(OBJEXT)  \
+    $(OBJ_DIR)\datesx$(OBJEXT)   \
+    $(OBJ_DIR)\defpath$(OBJEXT)  \
+    $(OBJ_DIR)\descend$(OBJEXT)  \
+    $(OBJ_DIR)\dirdrive$(OBJEXT) \
+    $(OBJ_DIR)\direct$(OBJEXT)   \
+    $(OBJ_DIR)\diskspac$(OBJEXT) \
+    $(OBJ_DIR)\disksphb$(OBJEXT) \
+    $(OBJ_DIR)\do$(OBJEXT)       \
+    $(OBJ_DIR)\empty$(OBJEXT)    \
+    $(OBJ_DIR)\errorapi$(OBJEXT) \
+    $(OBJ_DIR)\errorint$(OBJEXT) \
+    $(OBJ_DIR)\file$(OBJEXT)     \
+    $(OBJ_DIR)\filehb$(OBJEXT)   \
+    $(OBJ_DIR)\filesys$(OBJEXT)  \
+    $(OBJ_DIR)\fkmax$(OBJEXT)    \
+    $(OBJ_DIR)\fnsplit$(OBJEXT)  \
+    $(OBJ_DIR)\fserror$(OBJEXT)  \
+    $(OBJ_DIR)\fssize$(OBJEXT)   \
+    $(OBJ_DIR)\fstemp$(OBJEXT)   \
+    $(OBJ_DIR)\gete$(OBJEXT)     \
+    $(OBJ_DIR)\gt$(OBJEXT)       \
+    $(OBJ_DIR)\gtapi$(OBJEXT)    \
+    $(OBJ_DIR)\gtapiu$(OBJEXT)   \
+    $(OBJ_DIR)\gtclip$(OBJEXT)   \
+    $(OBJ_DIR)\gtfunc$(OBJEXT)   \
+    $(OBJ_DIR)\gtsys$(OBJEXT)    \
+    $(OBJ_DIR)\gttone$(OBJEXT)   \
+    $(OBJ_DIR)\gx$(OBJEXT)       \
+    $(OBJ_DIR)\hardcr$(OBJEXT)   \
+    $(OBJ_DIR)\hbcrc$(OBJEXT)    \
+    $(OBJ_DIR)\hbmd5$(OBJEXT)    \
+    $(OBJ_DIR)\hbffind$(OBJEXT)  \
+    $(OBJ_DIR)\hbgtcore$(OBJEXT) \
+    $(OBJ_DIR)\hbinet$(OBJEXT)   \
+    $(OBJ_DIR)\hbrandom$(OBJEXT) \
+    $(OBJ_DIR)\hbregex$(OBJEXT)  \
+    $(OBJ_DIR)\hbregexc$(OBJEXT) \
+    $(OBJ_DIR)\hbtoken$(OBJEXT)  \
+    $(OBJ_DIR)\idle$(OBJEXT)     \
+    $(OBJ_DIR)\inkey$(OBJEXT)    \
+    $(OBJ_DIR)\is$(OBJEXT)       \
+    $(OBJ_DIR)\isprint$(OBJEXT)  \
+    $(OBJ_DIR)\itemseri$(OBJEXT) \
+    $(OBJ_DIR)\langapi$(OBJEXT)  \
+    $(OBJ_DIR)\left$(OBJEXT)     \
+    $(OBJ_DIR)\len$(OBJEXT)      \
+    $(OBJ_DIR)\lennum$(OBJEXT)   \
+    $(OBJ_DIR)\math$(OBJEXT)     \
+    $(OBJ_DIR)\maxrow$(OBJEXT)   \
+    $(OBJ_DIR)\memofile$(OBJEXT) \
+    $(OBJ_DIR)\minmax$(OBJEXT)   \
+    $(OBJ_DIR)\mlcfunc$(OBJEXT)  \
+    $(OBJ_DIR)\mod$(OBJEXT)      \
+    $(OBJ_DIR)\mouseapi$(OBJEXT) \
+    $(OBJ_DIR)\mousex$(OBJEXT)   \
+    $(OBJ_DIR)\mtran$(OBJEXT)    \
+    $(OBJ_DIR)\natmsg$(OBJEXT)   \
+    $(OBJ_DIR)\net$(OBJEXT)      \
+    $(OBJ_DIR)\oemansi$(OBJEXT)  \
+    $(OBJ_DIR)\oldbox$(OBJEXT)   \
+    $(OBJ_DIR)\oldclear$(OBJEXT) \
+    $(OBJ_DIR)\pad$(OBJEXT)      \
+    $(OBJ_DIR)\padc$(OBJEXT)     \
+    $(OBJ_DIR)\padl$(OBJEXT)     \
+    $(OBJ_DIR)\padr$(OBJEXT)     \
+    $(OBJ_DIR)\philes$(OBJEXT)   \
+    $(OBJ_DIR)\philes53$(OBJEXT) \
+    $(OBJ_DIR)\philesx$(OBJEXT)  \
+    $(OBJ_DIR)\rat$(OBJEXT)      \
+    $(OBJ_DIR)\replic$(OBJEXT)   \
+    $(OBJ_DIR)\right$(OBJEXT)    \
+    $(OBJ_DIR)\round$(OBJEXT)    \
+    $(OBJ_DIR)\run$(OBJEXT)      \
+    $(OBJ_DIR)\samples$(OBJEXT)  \
+    $(OBJ_DIR)\saverest$(OBJEXT) \
+    $(OBJ_DIR)\scroll$(OBJEXT)   \
+    $(OBJ_DIR)\seconds$(OBJEXT)  \
+    $(OBJ_DIR)\set$(OBJEXT)      \
+    $(OBJ_DIR)\setcolor$(OBJEXT) \
+    $(OBJ_DIR)\setcurs$(OBJEXT)  \
+    $(OBJ_DIR)\setkey$(OBJEXT)   \
+    $(OBJ_DIR)\setpos$(OBJEXT)   \
+    $(OBJ_DIR)\setposbs$(OBJEXT) \
+    $(OBJ_DIR)\shadow$(OBJEXT)   \
+    $(OBJ_DIR)\soundex$(OBJEXT)  \
+    $(OBJ_DIR)\space$(OBJEXT)    \
+    $(OBJ_DIR)\spfiles$(OBJEXT)  \
+    $(OBJ_DIR)\str$(OBJEXT)      \
+    $(OBJ_DIR)\strpeek$(OBJEXT)  \
+    $(OBJ_DIR)\strcase$(OBJEXT)  \
+    $(OBJ_DIR)\strings$(OBJEXT)  \
+    $(OBJ_DIR)\strmatch$(OBJEXT) \
+    $(OBJ_DIR)\strtran$(OBJEXT)  \
+    $(OBJ_DIR)\strzero$(OBJEXT)  \
+    $(OBJ_DIR)\stuff$(OBJEXT)    \
+    $(OBJ_DIR)\substr$(OBJEXT)   \
+    $(OBJ_DIR)\tone$(OBJEXT)     \
+    $(OBJ_DIR)\trace$(OBJEXT)    \
+    $(OBJ_DIR)\transfrm$(OBJEXT) \
+    $(OBJ_DIR)\trim$(OBJEXT)     \
+    $(OBJ_DIR)\type$(OBJEXT)     \
+    $(OBJ_DIR)\val$(OBJEXT)      \
+    $(OBJ_DIR)\valtostr$(OBJEXT) \
+    $(OBJ_DIR)\valtype$(OBJEXT)  \
+    $(OBJ_DIR)\version$(OBJEXT)  \
+    $(OBJ_DIR)\word$(OBJEXT)     \
+    $(OBJ_DIR)\xhelp$(OBJEXT)    \
+    $(OBJ_DIR)\xsavescr$(OBJEXT) \
     \
-    $(OBJ_DIR)\achoice.obj  \
-    $(OBJ_DIR)\adir.obj     \
-    $(OBJ_DIR)\alert.obj    \
-    $(OBJ_DIR)\altd.obj     \
-    $(OBJ_DIR)\array.obj    \
-    $(OBJ_DIR)\block.obj    \
-    $(OBJ_DIR)\browdb.obj   \
-    $(OBJ_DIR)\browdbx.obj  \
-    $(OBJ_DIR)\browse.obj   \
-    $(OBJ_DIR)\characte.obj \
-    $(OBJ_DIR)\checkbox.obj \
-    $(OBJ_DIR)\color53.obj  \
-    $(OBJ_DIR)\date.obj     \
-    $(OBJ_DIR)\dbedit.obj   \
-    $(OBJ_DIR)\devoutp.obj  \
-    $(OBJ_DIR)\dircmd.obj   \
-    $(OBJ_DIR)\errorsys.obj \
-    $(OBJ_DIR)\fieldbl.obj  \
-    $(OBJ_DIR)\getlist.obj  \
-    $(OBJ_DIR)\getsys.obj   \
-    $(OBJ_DIR)\input.obj    \
-    $(OBJ_DIR)\listbox.obj  \
-    $(OBJ_DIR)\logical.obj  \
-    $(OBJ_DIR)\memoedit.obj \
-    $(OBJ_DIR)\memvarbl.obj \
-    $(OBJ_DIR)\menuto.obj   \
-    $(OBJ_DIR)\mssgline.obj \
-    $(OBJ_DIR)\nil.obj      \
-    $(OBJ_DIR)\numeric.obj  \
-    $(OBJ_DIR)\objfunc.obj  \
-    $(OBJ_DIR)\perfuncs.obj \
-    $(OBJ_DIR)\persist.obj  \
-    $(OBJ_DIR)\profiler.obj \
-    $(OBJ_DIR)\pushbtn.obj  \
-    $(OBJ_DIR)\radiobtn.obj \
-    $(OBJ_DIR)\radiogrp.obj \
-    $(OBJ_DIR)\readkey.obj  \
-    $(OBJ_DIR)\readvar.obj  \
-    $(OBJ_DIR)\scalar.obj   \
-    $(OBJ_DIR)\scrollbr.obj \
-    $(OBJ_DIR)\setfunc.obj  \
-    $(OBJ_DIR)\setta.obj    \
-    $(OBJ_DIR)\symbol.obj   \
-    $(OBJ_DIR)\tbcolumn.obj \
-    $(OBJ_DIR)\tbrowse.obj  \
-    $(OBJ_DIR)\tclass.obj   \
-    $(OBJ_DIR)\teditor.obj  \
-    $(OBJ_DIR)\terror.obj   \
-    $(OBJ_DIR)\text.obj     \
-    $(OBJ_DIR)\tget.obj     \
-    $(OBJ_DIR)\tgetint.obj  \
-    $(OBJ_DIR)\tgetlist.obj \
-    $(OBJ_DIR)\tlabel.obj   \
-    $(OBJ_DIR)\tmenuitm.obj \
-    $(OBJ_DIR)\tobject.obj  \
-    $(OBJ_DIR)\tpopup.obj   \
-    $(OBJ_DIR)\treport.obj  \
-    $(OBJ_DIR)\ttextlin.obj \
-    $(OBJ_DIR)\ttopbar.obj  \
-    $(OBJ_DIR)\typefile.obj \
-    $(OBJ_DIR)\valtoexp.obj \
-    $(OBJ_DIR)\wait.obj     \
+    $(OBJ_DIR)\achoice$(OBJEXT)  \
+    $(OBJ_DIR)\adir$(OBJEXT)     \
+    $(OBJ_DIR)\alert$(OBJEXT)    \
+    $(OBJ_DIR)\altd$(OBJEXT)     \
+    $(OBJ_DIR)\array$(OBJEXT)    \
+    $(OBJ_DIR)\block$(OBJEXT)    \
+    $(OBJ_DIR)\browdb$(OBJEXT)   \
+    $(OBJ_DIR)\browdbx$(OBJEXT)  \
+    $(OBJ_DIR)\browse$(OBJEXT)   \
+    $(OBJ_DIR)\characte$(OBJEXT) \
+    $(OBJ_DIR)\checkbox$(OBJEXT) \
+    $(OBJ_DIR)\color53$(OBJEXT)  \
+    $(OBJ_DIR)\date$(OBJEXT)     \
+    $(OBJ_DIR)\dbedit$(OBJEXT)   \
+    $(OBJ_DIR)\devoutp$(OBJEXT)  \
+    $(OBJ_DIR)\dircmd$(OBJEXT)   \
+    $(OBJ_DIR)\errorsys$(OBJEXT) \
+    $(OBJ_DIR)\fieldbl$(OBJEXT)  \
+    $(OBJ_DIR)\getlist$(OBJEXT)  \
+    $(OBJ_DIR)\getsys$(OBJEXT)   \
+    $(OBJ_DIR)\input$(OBJEXT)    \
+    $(OBJ_DIR)\listbox$(OBJEXT)  \
+    $(OBJ_DIR)\logical$(OBJEXT)  \
+    $(OBJ_DIR)\memoedit$(OBJEXT) \
+    $(OBJ_DIR)\memvarbl$(OBJEXT) \
+    $(OBJ_DIR)\menuto$(OBJEXT)   \
+    $(OBJ_DIR)\mssgline$(OBJEXT) \
+    $(OBJ_DIR)\nil$(OBJEXT)      \
+    $(OBJ_DIR)\numeric$(OBJEXT)  \
+    $(OBJ_DIR)\objfunc$(OBJEXT)  \
+    $(OBJ_DIR)\perfuncs$(OBJEXT) \
+    $(OBJ_DIR)\persist$(OBJEXT)  \
+    $(OBJ_DIR)\profiler$(OBJEXT) \
+    $(OBJ_DIR)\pushbtn$(OBJEXT)  \
+    $(OBJ_DIR)\radiobtn$(OBJEXT) \
+    $(OBJ_DIR)\radiogrp$(OBJEXT) \
+    $(OBJ_DIR)\readkey$(OBJEXT)  \
+    $(OBJ_DIR)\readvar$(OBJEXT)  \
+    $(OBJ_DIR)\scalar$(OBJEXT)   \
+    $(OBJ_DIR)\scrollbr$(OBJEXT) \
+    $(OBJ_DIR)\setfunc$(OBJEXT)  \
+    $(OBJ_DIR)\setta$(OBJEXT)    \
+    $(OBJ_DIR)\symbol$(OBJEXT)   \
+    $(OBJ_DIR)\tbcolumn$(OBJEXT) \
+    $(OBJ_DIR)\tbrowse$(OBJEXT)  \
+    $(OBJ_DIR)\tclass$(OBJEXT)   \
+    $(OBJ_DIR)\teditor$(OBJEXT)  \
+    $(OBJ_DIR)\terror$(OBJEXT)   \
+    $(OBJ_DIR)\text$(OBJEXT)     \
+    $(OBJ_DIR)\tget$(OBJEXT)     \
+    $(OBJ_DIR)\tgetint$(OBJEXT)  \
+    $(OBJ_DIR)\tgetlist$(OBJEXT) \
+    $(OBJ_DIR)\tlabel$(OBJEXT)   \
+    $(OBJ_DIR)\tmenuitm$(OBJEXT) \
+    $(OBJ_DIR)\tobject$(OBJEXT)  \
+    $(OBJ_DIR)\tpopup$(OBJEXT)   \
+    $(OBJ_DIR)\treport$(OBJEXT)  \
+    $(OBJ_DIR)\ttextlin$(OBJEXT) \
+    $(OBJ_DIR)\ttopbar$(OBJEXT)  \
+    $(OBJ_DIR)\typefile$(OBJEXT) \
+    $(OBJ_DIR)\valtoexp$(OBJEXT) \
+    $(OBJ_DIR)\wait$(OBJEXT)     \
 
 #**********************************************************
 
 MACRO_LIB_OBJS = \
-    $(OBJ_DIR)\macroy.obj   \
-    $(OBJ_DIR)\macroa.obj   \
-    $(OBJ_DIR)\macrob.obj   \
-    $(OBJ_DIR)\macrolex.obj \
+    $(OBJ_DIR)\macroy$(OBJEXT)   \
+    $(OBJ_DIR)\macroa$(OBJEXT)   \
+    $(OBJ_DIR)\macrob$(OBJEXT)   \
+    $(OBJ_DIR)\macrolex$(OBJEXT) \
 
 #**********************************************************
 
 DEBUG_LIB_OBJS = \
-    $(OBJ_DIR)\dbgentry.obj \
-    $(OBJ_DIR)\dbgbrwsr.obj \
-    $(OBJ_DIR)\dbghelp.obj  \
-    $(OBJ_DIR)\dbgmenu.obj  \
-    $(OBJ_DIR)\dbgtmenu.obj \
-    $(OBJ_DIR)\dbgtmitm.obj \
-    $(OBJ_DIR)\dbgtwin.obj  \
-    $(OBJ_DIR)\debugger.obj \
-    $(OBJ_DIR)\dbgtarr.obj  \
-    $(OBJ_DIR)\dbgtobj.obj  \
-    $(OBJ_DIR)\dbgthsh.obj  \
-    $(OBJ_DIR)\tbrwtext.obj \
-    $(OBJ_DIR)\dbgwa.obj    \
+    $(OBJ_DIR)\dbgentry$(OBJEXT) \
+    $(OBJ_DIR)\dbgbrwsr$(OBJEXT) \
+    $(OBJ_DIR)\dbghelp$(OBJEXT)  \
+    $(OBJ_DIR)\dbgmenu$(OBJEXT)  \
+    $(OBJ_DIR)\dbgtmenu$(OBJEXT) \
+    $(OBJ_DIR)\dbgtmitm$(OBJEXT) \
+    $(OBJ_DIR)\dbgtwin$(OBJEXT)  \
+    $(OBJ_DIR)\debugger$(OBJEXT) \
+    $(OBJ_DIR)\dbgtarr$(OBJEXT)  \
+    $(OBJ_DIR)\dbgtobj$(OBJEXT)  \
+    $(OBJ_DIR)\dbgthsh$(OBJEXT)  \
+    $(OBJ_DIR)\tbrwtext$(OBJEXT) \
+    $(OBJ_DIR)\dbgwa$(OBJEXT)    \
 
 #**********************************************************
 
 LANG_LIB_OBJS = \
-    $(OBJ_DIR)\msgbg866.obj \
-    $(OBJ_DIR)\msgbgiso.obj \
-    $(OBJ_DIR)\msgbgwin.obj \
-    $(OBJ_DIR)\msgca.obj    \
-    $(OBJ_DIR)\msgcs852.obj \
-    $(OBJ_DIR)\msgcsiso.obj \
-    $(OBJ_DIR)\msgcskam.obj \
-    $(OBJ_DIR)\msgcswin.obj \
-    $(OBJ_DIR)\msgde.obj    \
-    $(OBJ_DIR)\msgdewin.obj \
-    $(OBJ_DIR)\msgel.obj    \
-    $(OBJ_DIR)\msgelwin.obj \
-    $(OBJ_DIR)\msgeo.obj    \
-    $(OBJ_DIR)\msges.obj    \
-    $(OBJ_DIR)\msgeswin.obj \
-    $(OBJ_DIR)\msgeu.obj    \
-    $(OBJ_DIR)\msgfr.obj    \
-    $(OBJ_DIR)\msggl.obj    \
-    $(OBJ_DIR)\msghe862.obj \
-    $(OBJ_DIR)\msghewin.obj \
-    $(OBJ_DIR)\msghr852.obj \
-    $(OBJ_DIR)\msghriso.obj \
-    $(OBJ_DIR)\msghu852.obj \
-    $(OBJ_DIR)\msghucwi.obj \
-    $(OBJ_DIR)\msghuiso.obj \
-    $(OBJ_DIR)\msghuwin.obj \
-    $(OBJ_DIR)\msgid.obj    \
-    $(OBJ_DIR)\msgis850.obj \
-    $(OBJ_DIR)\msgit.obj    \
-    $(OBJ_DIR)\msgko.obj    \
-    $(OBJ_DIR)\msgnl.obj    \
-    $(OBJ_DIR)\msgpl852.obj \
-    $(OBJ_DIR)\msgpliso.obj \
-    $(OBJ_DIR)\msgplmaz.obj \
-    $(OBJ_DIR)\msgplwin.obj \
-    $(OBJ_DIR)\msgpt.obj    \
-    $(OBJ_DIR)\msgro.obj    \
-    $(OBJ_DIR)\msgru866.obj \
-    $(OBJ_DIR)\msgrukoi.obj \
-    $(OBJ_DIR)\msgruwin.obj \
-    $(OBJ_DIR)\msgsl437.obj \
-    $(OBJ_DIR)\msgsl852.obj \
-    $(OBJ_DIR)\msgsliso.obj \
-    $(OBJ_DIR)\msgslwin.obj \
-    $(OBJ_DIR)\msgsr852.obj \
-    $(OBJ_DIR)\msgsriso.obj \
-    $(OBJ_DIR)\msgsrwin.obj \
-    $(OBJ_DIR)\msgtrdos.obj \
-    $(OBJ_DIR)\msgtrwin.obj \
-    $(OBJ_DIR)\msgzhb5.obj  \
-    $(OBJ_DIR)\msgzhgb.obj  \
+    $(OBJ_DIR)\msgbg866$(OBJEXT) \
+    $(OBJ_DIR)\msgbgiso$(OBJEXT) \
+    $(OBJ_DIR)\msgbgwin$(OBJEXT) \
+    $(OBJ_DIR)\msgca$(OBJEXT)    \
+    $(OBJ_DIR)\msgcs852$(OBJEXT) \
+    $(OBJ_DIR)\msgcsiso$(OBJEXT) \
+    $(OBJ_DIR)\msgcskam$(OBJEXT) \
+    $(OBJ_DIR)\msgcswin$(OBJEXT) \
+    $(OBJ_DIR)\msgde$(OBJEXT)    \
+    $(OBJ_DIR)\msgdewin$(OBJEXT) \
+    $(OBJ_DIR)\msgel$(OBJEXT)    \
+    $(OBJ_DIR)\msgelwin$(OBJEXT) \
+    $(OBJ_DIR)\msgeo$(OBJEXT)    \
+    $(OBJ_DIR)\msges$(OBJEXT)    \
+    $(OBJ_DIR)\msgeswin$(OBJEXT) \
+    $(OBJ_DIR)\msgeu$(OBJEXT)    \
+    $(OBJ_DIR)\msgfr$(OBJEXT)    \
+    $(OBJ_DIR)\msggl$(OBJEXT)    \
+    $(OBJ_DIR)\msghe862$(OBJEXT) \
+    $(OBJ_DIR)\msghewin$(OBJEXT) \
+    $(OBJ_DIR)\msghr852$(OBJEXT) \
+    $(OBJ_DIR)\msghriso$(OBJEXT) \
+    $(OBJ_DIR)\msghu852$(OBJEXT) \
+    $(OBJ_DIR)\msghucwi$(OBJEXT) \
+    $(OBJ_DIR)\msghuiso$(OBJEXT) \
+    $(OBJ_DIR)\msghuwin$(OBJEXT) \
+    $(OBJ_DIR)\msgid$(OBJEXT)    \
+    $(OBJ_DIR)\msgis850$(OBJEXT) \
+    $(OBJ_DIR)\msgit$(OBJEXT)    \
+    $(OBJ_DIR)\msgko$(OBJEXT)    \
+    $(OBJ_DIR)\msgnl$(OBJEXT)    \
+    $(OBJ_DIR)\msgpl852$(OBJEXT) \
+    $(OBJ_DIR)\msgpliso$(OBJEXT) \
+    $(OBJ_DIR)\msgplmaz$(OBJEXT) \
+    $(OBJ_DIR)\msgplwin$(OBJEXT) \
+    $(OBJ_DIR)\msgpt$(OBJEXT)    \
+    $(OBJ_DIR)\msgro$(OBJEXT)    \
+    $(OBJ_DIR)\msgru866$(OBJEXT) \
+    $(OBJ_DIR)\msgrukoi$(OBJEXT) \
+    $(OBJ_DIR)\msgruwin$(OBJEXT) \
+    $(OBJ_DIR)\msgsl437$(OBJEXT) \
+    $(OBJ_DIR)\msgsl852$(OBJEXT) \
+    $(OBJ_DIR)\msgsliso$(OBJEXT) \
+    $(OBJ_DIR)\msgslwin$(OBJEXT) \
+    $(OBJ_DIR)\msgsr852$(OBJEXT) \
+    $(OBJ_DIR)\msgsriso$(OBJEXT) \
+    $(OBJ_DIR)\msgsrwin$(OBJEXT) \
+    $(OBJ_DIR)\msgtrdos$(OBJEXT) \
+    $(OBJ_DIR)\msgtrwin$(OBJEXT) \
+    $(OBJ_DIR)\msgzhb5$(OBJEXT)  \
+    $(OBJ_DIR)\msgzhgb$(OBJEXT)  \
 
 #**********************************************************
 PCRE_LIB_OBJS = \
-    $(OBJ_DIR)\chartabs.obj \
-    $(OBJ_DIR)\pcrecomp.obj \
-    $(OBJ_DIR)\pcreconf.obj \
-    $(OBJ_DIR)\pcredfa.obj  \
-    $(OBJ_DIR)\pcreexec.obj \
-    $(OBJ_DIR)\pcrefinf.obj \
-    $(OBJ_DIR)\pcreget.obj  \
-    $(OBJ_DIR)\pcreglob.obj \
-    $(OBJ_DIR)\pcreinfo.obj \
-    $(OBJ_DIR)\pcremktb.obj \
-    $(OBJ_DIR)\pcreoutf.obj \
-    $(OBJ_DIR)\pcreprni.obj \
-    $(OBJ_DIR)\pcrerefc.obj \
-    $(OBJ_DIR)\pcrestud.obj \
-    $(OBJ_DIR)\pcretabs.obj \
-    $(OBJ_DIR)\pcretryf.obj \
-    $(OBJ_DIR)\pcrefind.obj \
-    $(OBJ_DIR)\pcrevutf.obj \
-    $(OBJ_DIR)\pcrever.obj  \
-    $(OBJ_DIR)\pcrexcls.obj \
+    $(OBJ_DIR)\chartabs$(OBJEXT) \
+    $(OBJ_DIR)\pcrecomp$(OBJEXT) \
+    $(OBJ_DIR)\pcreconf$(OBJEXT) \
+    $(OBJ_DIR)\pcredfa$(OBJEXT)  \
+    $(OBJ_DIR)\pcreexec$(OBJEXT) \
+    $(OBJ_DIR)\pcrefinf$(OBJEXT) \
+    $(OBJ_DIR)\pcreget$(OBJEXT)  \
+    $(OBJ_DIR)\pcreglob$(OBJEXT) \
+    $(OBJ_DIR)\pcreinfo$(OBJEXT) \
+    $(OBJ_DIR)\pcremktb$(OBJEXT) \
+    $(OBJ_DIR)\pcreoutf$(OBJEXT) \
+    $(OBJ_DIR)\pcreprni$(OBJEXT) \
+    $(OBJ_DIR)\pcrerefc$(OBJEXT) \
+    $(OBJ_DIR)\pcrestud$(OBJEXT) \
+    $(OBJ_DIR)\pcretabs$(OBJEXT) \
+    $(OBJ_DIR)\pcretryf$(OBJEXT) \
+    $(OBJ_DIR)\pcrefind$(OBJEXT) \
+    $(OBJ_DIR)\pcrevutf$(OBJEXT) \
+    $(OBJ_DIR)\pcrever$(OBJEXT)  \
+    $(OBJ_DIR)\pcrexcls$(OBJEXT) \
 
 #**********************************************************
 
 CODEPAGE_LIB_OBJS = \
-    $(OBJ_DIR)\cpbg866.obj  \
-    $(OBJ_DIR)\cpbgiso.obj  \
-    $(OBJ_DIR)\cpbgwin.obj  \
-    $(OBJ_DIR)\cpcs852.obj  \
-    $(OBJ_DIR)\cpcsiso.obj  \
-    $(OBJ_DIR)\cpcskam.obj  \
-    $(OBJ_DIR)\cpcswin.obj  \
-    $(OBJ_DIR)\cpeldos.obj  \
-    $(OBJ_DIR)\cpelwin.obj  \
-    $(OBJ_DIR)\cpesdos.obj  \
-    $(OBJ_DIR)\cpesmwi.obj  \
-    $(OBJ_DIR)\cpeswin.obj  \
-    $(OBJ_DIR)\cpfrdos.obj  \
-    $(OBJ_DIR)\cpgedos.obj  \
-    $(OBJ_DIR)\cpgewin.obj  \
-    $(OBJ_DIR)\cphr1250.obj \
-    $(OBJ_DIR)\cphr437.obj  \
-    $(OBJ_DIR)\cphr852.obj  \
-    $(OBJ_DIR)\cphu852.obj  \
-    $(OBJ_DIR)\cphu852s.obj \
-    $(OBJ_DIR)\cphuiso.obj  \
-    $(OBJ_DIR)\cphuisos.obj \
-    $(OBJ_DIR)\cphuwin.obj  \
-    $(OBJ_DIR)\cphuwins.obj \
-    $(OBJ_DIR)\cpit437.obj  \
-    $(OBJ_DIR)\cpit850.obj  \
-    $(OBJ_DIR)\cpitisb.obj  \
-    $(OBJ_DIR)\cpitiso.obj  \
-    $(OBJ_DIR)\cpltwin.obj  \
-    $(OBJ_DIR)\cppl852.obj  \
-    $(OBJ_DIR)\cppliso.obj  \
-    $(OBJ_DIR)\cpplmaz.obj  \
-    $(OBJ_DIR)\cpplwin.obj  \
-    $(OBJ_DIR)\cppt850.obj  \
-    $(OBJ_DIR)\cpptiso.obj  \
-    $(OBJ_DIR)\cpru866.obj  \
-    $(OBJ_DIR)\cprukoi.obj  \
-    $(OBJ_DIR)\cpruwin.obj  \
-    $(OBJ_DIR)\cpsl437.obj  \
-    $(OBJ_DIR)\cpsl852.obj  \
-    $(OBJ_DIR)\cpsliso.obj  \
-    $(OBJ_DIR)\cpslwin.obj  \
-    $(OBJ_DIR)\cpsrwin.obj  \
-    $(OBJ_DIR)\cptrdos.obj  \
-    $(OBJ_DIR)\cptrwin.obj  \
-    $(OBJ_DIR)\cpua866.obj  \
-    $(OBJ_DIR)\cpuakoi.obj  \
-    $(OBJ_DIR)\cpuawin.obj  \
-    $(OBJ_DIR)\uc1250.obj   \
-    $(OBJ_DIR)\uc1251.obj   \
-    $(OBJ_DIR)\uc1253.obj   \
-    $(OBJ_DIR)\uc1254.obj   \
-    $(OBJ_DIR)\uc1257.obj   \
-    $(OBJ_DIR)\uc737.obj    \
-    $(OBJ_DIR)\uc850.obj    \
-    $(OBJ_DIR)\uc852.obj    \
-    $(OBJ_DIR)\uc857.obj    \
-    $(OBJ_DIR)\uc866.obj    \
-    $(OBJ_DIR)\uc8859_1.obj \
-    $(OBJ_DIR)\uc8859_2.obj \
-    $(OBJ_DIR)\uc8859_5.obj \
-    $(OBJ_DIR)\uc88591b.obj \
-    $(OBJ_DIR)\uckoi8.obj   \
-    $(OBJ_DIR)\uckoi8u.obj  \
-    $(OBJ_DIR)\ucmaz.obj    \
-    $(OBJ_DIR)\uckam.obj    \
+    $(OBJ_DIR)\cpbg866$(OBJEXT)  \
+    $(OBJ_DIR)\cpbgiso$(OBJEXT)  \
+    $(OBJ_DIR)\cpbgwin$(OBJEXT)  \
+    $(OBJ_DIR)\cpcs852$(OBJEXT)  \
+    $(OBJ_DIR)\cpcsiso$(OBJEXT)  \
+    $(OBJ_DIR)\cpcskam$(OBJEXT)  \
+    $(OBJ_DIR)\cpcswin$(OBJEXT)  \
+    $(OBJ_DIR)\cpeldos$(OBJEXT)  \
+    $(OBJ_DIR)\cpelwin$(OBJEXT)  \
+    $(OBJ_DIR)\cpesdos$(OBJEXT)  \
+    $(OBJ_DIR)\cpesmwi$(OBJEXT)  \
+    $(OBJ_DIR)\cpeswin$(OBJEXT)  \
+    $(OBJ_DIR)\cpfrdos$(OBJEXT)  \
+    $(OBJ_DIR)\cpgedos$(OBJEXT)  \
+    $(OBJ_DIR)\cpgewin$(OBJEXT)  \
+    $(OBJ_DIR)\cphr1250$(OBJEXT) \
+    $(OBJ_DIR)\cphr437$(OBJEXT)  \
+    $(OBJ_DIR)\cphr852$(OBJEXT)  \
+    $(OBJ_DIR)\cphu852$(OBJEXT)  \
+    $(OBJ_DIR)\cphu852s$(OBJEXT) \
+    $(OBJ_DIR)\cphuiso$(OBJEXT)  \
+    $(OBJ_DIR)\cphuisos$(OBJEXT) \
+    $(OBJ_DIR)\cphuwin$(OBJEXT)  \
+    $(OBJ_DIR)\cphuwins$(OBJEXT) \
+    $(OBJ_DIR)\cpit437$(OBJEXT)  \
+    $(OBJ_DIR)\cpit850$(OBJEXT)  \
+    $(OBJ_DIR)\cpitisb$(OBJEXT)  \
+    $(OBJ_DIR)\cpitiso$(OBJEXT)  \
+    $(OBJ_DIR)\cpltwin$(OBJEXT)  \
+    $(OBJ_DIR)\cppl852$(OBJEXT)  \
+    $(OBJ_DIR)\cppliso$(OBJEXT)  \
+    $(OBJ_DIR)\cpplmaz$(OBJEXT)  \
+    $(OBJ_DIR)\cpplwin$(OBJEXT)  \
+    $(OBJ_DIR)\cppt850$(OBJEXT)  \
+    $(OBJ_DIR)\cpptiso$(OBJEXT)  \
+    $(OBJ_DIR)\cpru866$(OBJEXT)  \
+    $(OBJ_DIR)\cprukoi$(OBJEXT)  \
+    $(OBJ_DIR)\cpruwin$(OBJEXT)  \
+    $(OBJ_DIR)\cpsl437$(OBJEXT)  \
+    $(OBJ_DIR)\cpsl852$(OBJEXT)  \
+    $(OBJ_DIR)\cpsliso$(OBJEXT)  \
+    $(OBJ_DIR)\cpslwin$(OBJEXT)  \
+    $(OBJ_DIR)\cpsrwin$(OBJEXT)  \
+    $(OBJ_DIR)\cptrdos$(OBJEXT)  \
+    $(OBJ_DIR)\cptrwin$(OBJEXT)  \
+    $(OBJ_DIR)\cpua866$(OBJEXT)  \
+    $(OBJ_DIR)\cpuakoi$(OBJEXT)  \
+    $(OBJ_DIR)\cpuawin$(OBJEXT)  \
+    $(OBJ_DIR)\uc1250$(OBJEXT)   \
+    $(OBJ_DIR)\uc1251$(OBJEXT)   \
+    $(OBJ_DIR)\uc1253$(OBJEXT)   \
+    $(OBJ_DIR)\uc1254$(OBJEXT)   \
+    $(OBJ_DIR)\uc1257$(OBJEXT)   \
+    $(OBJ_DIR)\uc737$(OBJEXT)    \
+    $(OBJ_DIR)\uc850$(OBJEXT)    \
+    $(OBJ_DIR)\uc852$(OBJEXT)    \
+    $(OBJ_DIR)\uc857$(OBJEXT)    \
+    $(OBJ_DIR)\uc866$(OBJEXT)    \
+    $(OBJ_DIR)\uc8859_1$(OBJEXT) \
+    $(OBJ_DIR)\uc8859_2$(OBJEXT) \
+    $(OBJ_DIR)\uc8859_5$(OBJEXT) \
+    $(OBJ_DIR)\uc88591b$(OBJEXT) \
+    $(OBJ_DIR)\uckoi8$(OBJEXT)   \
+    $(OBJ_DIR)\uckoi8u$(OBJEXT)  \
+    $(OBJ_DIR)\ucmaz$(OBJEXT)    \
+    $(OBJ_DIR)\uckam$(OBJEXT)    \
 
 #**********************************************************
 
 RDD_LIB_OBJS = \
-    $(OBJ_DIR)\dbcmd.obj    \
-    $(OBJ_DIR)\workarea.obj \
-    $(OBJ_DIR)\wacore.obj   \
-    $(OBJ_DIR)\wafunc.obj   \
-    $(OBJ_DIR)\dbf1.obj     \
-    $(OBJ_DIR)\dbnubs.obj   \
-    $(OBJ_DIR)\delim1.obj   \
-    $(OBJ_DIR)\sdf1.obj     \
+    $(OBJ_DIR)\dbcmd$(OBJEXT)    \
+    $(OBJ_DIR)\workarea$(OBJEXT) \
+    $(OBJ_DIR)\wacore$(OBJEXT)   \
+    $(OBJ_DIR)\wafunc$(OBJEXT)   \
+    $(OBJ_DIR)\dbf1$(OBJEXT)     \
+    $(OBJ_DIR)\dbnubs$(OBJEXT)   \
+    $(OBJ_DIR)\delim1$(OBJEXT)   \
+    $(OBJ_DIR)\sdf1$(OBJEXT)     \
     \
-    $(OBJ_DIR)\dbdelim.obj  \
-    $(OBJ_DIR)\dbsdf.obj    \
-    $(OBJ_DIR)\dbjoin.obj   \
-    $(OBJ_DIR)\dbtotal.obj  \
-    $(OBJ_DIR)\dbfuncs.obj  \
-    $(OBJ_DIR)\dblist.obj   \
-    $(OBJ_DIR)\dbsort.obj   \
-    $(OBJ_DIR)\hbdbsort.obj \
-    $(OBJ_DIR)\dbstrux.obj  \
-    $(OBJ_DIR)\dbupdat.obj  \
-    $(OBJ_DIR)\rddord.obj   \
-    $(OBJ_DIR)\rddsys.obj   \
+    $(OBJ_DIR)\dbdelim$(OBJEXT)  \
+    $(OBJ_DIR)\dbsdf$(OBJEXT)    \
+    $(OBJ_DIR)\dbjoin$(OBJEXT)   \
+    $(OBJ_DIR)\dbtotal$(OBJEXT)  \
+    $(OBJ_DIR)\dbfuncs$(OBJEXT)  \
+    $(OBJ_DIR)\dblist$(OBJEXT)   \
+    $(OBJ_DIR)\dbsort$(OBJEXT)   \
+    $(OBJ_DIR)\hbdbsort$(OBJEXT) \
+    $(OBJ_DIR)\dbstrux$(OBJEXT)  \
+    $(OBJ_DIR)\dbupdat$(OBJEXT)  \
+    $(OBJ_DIR)\rddord$(OBJEXT)   \
+    $(OBJ_DIR)\rddsys$(OBJEXT)   \
 
 #**********************************************************
 
 NULSYS_LIB_OBJS = \
-    $(OBJ_DIR)\nulsys.obj
+    $(OBJ_DIR)\nulsys$(OBJEXT)
 
 #**********************************************************
 
 DBFNTX_LIB_OBJS = \
-    $(OBJ_DIR)\dbfntx1.obj  \
-    $(OBJ_DIR)\dbfntx0.obj  \
+    $(OBJ_DIR)\dbfntx1$(OBJEXT)  \
+    $(OBJ_DIR)\dbfntx0$(OBJEXT)  \
 
 #**********************************************************
 
 DBFCDX_LIB_OBJS = \
-    $(OBJ_DIR)\dbfcdx1.obj  \
-    $(OBJ_DIR)\sixcdx1.obj  \
+    $(OBJ_DIR)\dbfcdx1$(OBJEXT)  \
+    $(OBJ_DIR)\sixcdx1$(OBJEXT)  \
 
 #**********************************************************
 
 DBFFPT_LIB_OBJS = \
-    $(OBJ_DIR)\dbffpt1.obj  \
+    $(OBJ_DIR)\dbffpt1$(OBJEXT)  \
 
 #**********************************************************
 
 HBSIX_LIB_OBJS = \
-    $(OBJ_DIR)\sxcompr.obj  \
-    $(OBJ_DIR)\sxcrypt.obj  \
-    $(OBJ_DIR)\sxdate.obj   \
+    $(OBJ_DIR)\sxcompr$(OBJEXT)  \
+    $(OBJ_DIR)\sxcrypt$(OBJEXT)  \
+    $(OBJ_DIR)\sxdate$(OBJEXT)   \
 
 #**********************************************************
 
 HSX_LIB_OBJS = \
-    $(OBJ_DIR)\hsx.obj      \
-    $(OBJ_DIR)\cftsfunc.obj \
+    $(OBJ_DIR)\hsx$(OBJEXT)      \
+    $(OBJ_DIR)\cftsfunc$(OBJEXT) \
 
 #**********************************************************
 
 USRRDD_LIB_OBJS = \
-    $(OBJ_DIR)\usrrdd.obj   \
+    $(OBJ_DIR)\usrrdd$(OBJEXT)   \
 
 #**********************************************************
 
 GTCGI_LIB_OBJS = \
-    $(OBJ_DIR)\gtcgi.obj    \
+    $(OBJ_DIR)\gtcgi$(OBJEXT)    \
 
 #**********************************************************
 
 GTDOS_LIB_OBJS = \
-    $(OBJ_DIR)\gtdos.obj    \
+    $(OBJ_DIR)\gtdos$(OBJEXT)    \
 
 #**********************************************************
 
 GTPCA_LIB_OBJS = \
-    $(OBJ_DIR)\gtpca.obj    \
+    $(OBJ_DIR)\gtpca$(OBJEXT)    \
 
 #**********************************************************
 
 GTSTD_LIB_OBJS = \
-    $(OBJ_DIR)\gtstd.obj    \
+    $(OBJ_DIR)\gtstd$(OBJEXT)    \
 
 #**********************************************************
 
 GTWIN_LIB_OBJS = \
-    $(OBJ_DIR)\gtwin.obj    \
+    $(OBJ_DIR)\gtwin$(OBJEXT)    \
 
 #**********************************************************
 
 GTWVT_LIB_OBJS = \
-    $(OBJ_DIR)\gtwvt.obj    \
+    $(OBJ_DIR)\gtwvt$(OBJEXT)    \
 
 #**********************************************************
 
 GTGUI_LIB_COMMON_OBJS = \
-    $(OBJ_DIR)\gtgui.obj    \
+    $(OBJ_DIR)\gtgui$(OBJEXT)    \
 
 GTGUI_LIB_STATIC_OBJS = \
-    $(OBJ_DIR)\gtdef.obj    \
+    $(OBJ_DIR)\gtdef$(OBJEXT)    \
 
 GTGUI_LIB_SHARED_OBJS = \
 
@@ -815,101 +840,101 @@ GTGUI_DLL_OBJS = $(GTGUI_LIB_COMMON_OBJS) $(GTGUI_LIB_SHARED_OBJS)
 #**********************************************************
 
 HARBOUR_EXE_OBJS = \
-    $(OBJ_DIR)\harbour.obj  \
+    $(OBJ_DIR)\harbour$(OBJEXT)  \
 
 #**********************************************************
 
 HBPP_EXE_OBJS = \
-    $(OBJ_DIR)\hbpp.obj     \
-    $(OBJ_DIR)\hbpptbl.obj  \
-    $(OBJ_DIR)\hbppcomp.obj \
-    $(OBJ_DIR)\hbppcore.obj \
-    $(OBJ_DIR)\pragma.obj   \
+    $(OBJ_DIR)\hbpp$(OBJEXT)     \
+    $(OBJ_DIR)\hbpptbl$(OBJEXT)  \
+    $(OBJ_DIR)\hbppcomp$(OBJEXT) \
+    $(OBJ_DIR)\hbppcore$(OBJEXT) \
+    $(OBJ_DIR)\pragma$(OBJEXT)   \
 
-#    $(OBJ_DIR)\hbpplib.obj  \
+#    $(OBJ_DIR)\hbpplib$(OBJEXT)  \
 
 #**********************************************************
 
 HBPPGEN_EXE_OBJS = \
-    $(OBJ_DIR)\ppgen.obj    \
+    $(OBJ_DIR)\ppgen$(OBJEXT)    \
 
 #**********************************************************
 
 HBPPTEST_EXE_OBJS = \
-    $(OBJ_DIR)\pretest.obj  \
+    $(OBJ_DIR)\pretest$(OBJEXT)  \
 
 #**********************************************************
 
 HBRUN_EXE_OBJS = \
-    $(OBJ_DIR)\hbrun.obj    \
-    $(OBJ_DIR)\external.obj \
+    $(OBJ_DIR)\hbrun$(OBJEXT)    \
+    $(OBJ_DIR)\external$(OBJEXT) \
 
 #**********************************************************
 
 HBTEST_EXE_OBJS = \
-    $(OBJ_DIR)\hbtest.obj   \
-    $(OBJ_DIR)\rt_hvm.obj   \
-    $(OBJ_DIR)\rt_hvma.obj  \
-    $(OBJ_DIR)\rt_math.obj  \
-    $(OBJ_DIR)\rt_date.obj  \
-    $(OBJ_DIR)\rt_str.obj   \
-    $(OBJ_DIR)\rt_stra.obj  \
-    $(OBJ_DIR)\rt_trans.obj \
-    $(OBJ_DIR)\rt_array.obj \
-    $(OBJ_DIR)\rt_file.obj  \
-    $(OBJ_DIR)\rt_misc.obj  \
-    $(OBJ_DIR)\rt_class.obj \
+    $(OBJ_DIR)\hbtest$(OBJEXT)   \
+    $(OBJ_DIR)\rt_hvm$(OBJEXT)   \
+    $(OBJ_DIR)\rt_hvma$(OBJEXT)  \
+    $(OBJ_DIR)\rt_math$(OBJEXT)  \
+    $(OBJ_DIR)\rt_date$(OBJEXT)  \
+    $(OBJ_DIR)\rt_str$(OBJEXT)   \
+    $(OBJ_DIR)\rt_stra$(OBJEXT)  \
+    $(OBJ_DIR)\rt_trans$(OBJEXT) \
+    $(OBJ_DIR)\rt_array$(OBJEXT) \
+    $(OBJ_DIR)\rt_file$(OBJEXT)  \
+    $(OBJ_DIR)\rt_misc$(OBJEXT)  \
+    $(OBJ_DIR)\rt_class$(OBJEXT) \
 
 #**********************************************************
 
 HBDOC_EXE_OBJS = \
-    $(OBJ_DIR)\hbdoc.obj    \
-    $(OBJ_DIR)\genasc.obj   \
-    $(OBJ_DIR)\genhpc.obj   \
-    $(OBJ_DIR)\genhtm.obj   \
-    $(OBJ_DIR)\genchm.obj   \
-    $(OBJ_DIR)\genng.obj    \
-    $(OBJ_DIR)\genos2.obj   \
-    $(OBJ_DIR)\genrtf.obj   \
-    $(OBJ_DIR)\gentrf.obj   \
-    $(OBJ_DIR)\html.obj     \
-    $(OBJ_DIR)\ng.obj       \
-    $(OBJ_DIR)\os2.obj      \
-    $(OBJ_DIR)\rtf.obj      \
-    $(OBJ_DIR)\troff.obj    \
-    $(OBJ_DIR)\fclass1.obj  \
-    $(OBJ_DIR)\ffile1.obj   \
-    $(OBJ_DIR)\ft_funcs.obj \
+    $(OBJ_DIR)\hbdoc$(OBJEXT)    \
+    $(OBJ_DIR)\genasc$(OBJEXT)   \
+    $(OBJ_DIR)\genhpc$(OBJEXT)   \
+    $(OBJ_DIR)\genhtm$(OBJEXT)   \
+    $(OBJ_DIR)\genchm$(OBJEXT)   \
+    $(OBJ_DIR)\genng$(OBJEXT)    \
+    $(OBJ_DIR)\genos2$(OBJEXT)   \
+    $(OBJ_DIR)\genrtf$(OBJEXT)   \
+    $(OBJ_DIR)\gentrf$(OBJEXT)   \
+    $(OBJ_DIR)\html$(OBJEXT)     \
+    $(OBJ_DIR)\ng$(OBJEXT)       \
+    $(OBJ_DIR)\os2$(OBJEXT)      \
+    $(OBJ_DIR)\rtf$(OBJEXT)      \
+    $(OBJ_DIR)\troff$(OBJEXT)    \
+    $(OBJ_DIR)\fclass1$(OBJEXT)  \
+    $(OBJ_DIR)\ffile1$(OBJEXT)   \
+    $(OBJ_DIR)\ft_funcs$(OBJEXT) \
 
 !ifdef HB_DOC_PDF
 
 # PDF support for HBDOC
 HBDOC_EXE_OBJS = \
     $(HBDOC_EXE_OBJS)       \
-    $(OBJ_DIR)\pdfhbdoc.obj \
-    $(OBJ_DIR)\genpdf1.obj  \
+    $(OBJ_DIR)\pdfhbdoc$(OBJEXT) \
+    $(OBJ_DIR)\genpdf1$(OBJEXT)  \
 
 !endif
 
 #**********************************************************
 
 HBMAKE_EXE_OBJS = \
-    $(OBJ_DIR)\hbmake.obj   \
-    $(OBJ_DIR)\hbmutils.obj \
-    $(OBJ_DIR)\checks.obj   \
-    $(OBJ_DIR)\pickarry.obj \
-    $(OBJ_DIR)\pickfile.obj \
-    $(OBJ_DIR)\prb_stak.obj \
-    $(OBJ_DIR)\radios.obj   \
-    $(OBJ_DIR)\fclass1.obj  \
-    $(OBJ_DIR)\ffile1.obj   \
-    $(OBJ_DIR)\ft_funcs.obj \
-    $(OBJ_DIR)\hbmlang.obj  \
+    $(OBJ_DIR)\hbmake$(OBJEXT)   \
+    $(OBJ_DIR)\hbmutils$(OBJEXT) \
+    $(OBJ_DIR)\checks$(OBJEXT)   \
+    $(OBJ_DIR)\pickarry$(OBJEXT) \
+    $(OBJ_DIR)\pickfile$(OBJEXT) \
+    $(OBJ_DIR)\prb_stak$(OBJEXT) \
+    $(OBJ_DIR)\radios$(OBJEXT)   \
+    $(OBJ_DIR)\fclass1$(OBJEXT)  \
+    $(OBJ_DIR)\ffile1$(OBJEXT)   \
+    $(OBJ_DIR)\ft_funcs$(OBJEXT) \
+    $(OBJ_DIR)\hbmlang$(OBJEXT)  \
 
 #**********************************************************
 
 HBVER_EXE_OBJS = \
-    $(OBJ_DIR)\hbverfix.obj \
+    $(OBJ_DIR)\hbverfix$(OBJEXT) \
 
 #**********************************************************
 #**********************************************************
diff --git a/harbour/contrib/mysql/mysql.c b/harbour/contrib/mysql/mysql.c
index f964a422f3..4616378d98 100644
--- a/harbour/contrib/mysql/mysql.c
+++ b/harbour/contrib/mysql/mysql.c
@@ -361,26 +361,6 @@ HB_FUNC( SQLSRVINFO )
    hb_retc( mysql_get_server_info( (MYSQL *)_parnl(1) ) );
 }
 
-#ifdef __GNUC__
-long filelength( int handle )
-{
-    int nEnd = hb_fsSeek( handle, 0 , 2 );
-    int nStart = hb_fsSeek( handle , 0 , 0 );
-    return nEnd - nStart;
-}
-#endif
-
-char *filetoBuff(char *f,char *s)
-{
-
-   int i;
-   int fh = hb_fsOpen( ( BYTE * ) s , 2 );
-   i = hb_fsReadLarge( fh , ( BYTE * ) f , filelength( fh ) );
-   f[ i ] = '\0';
-   hb_fsClose( fh );
-   return f   ;
-}
-
 HB_FUNC( DATATOSQL )
 {
    const char *from;
@@ -394,24 +374,38 @@ HB_FUNC( DATATOSQL )
    hb_retclen_buffer( (char*)buffer,iSize );
 }
 
+static char * filetoBuff( char * fname, int * size )
+{
+   char * buffer = NULL;
+   int handle = hb_fsOpen( ( BYTE * ) fname, 2 );
+
+   if( handle != FS_ERROR )
+   {
+      * size = ( int ) hb_fsSeek( handle, 0, FS_END );
+      * size -= ( int ) hb_fsSeek( handle, 0, FS_SET );
+      buffer = ( char * ) hb_xgrab( * size + 1 );
+      * size = hb_fsReadLarge( handle, ( BYTE * ) buffer, * size );
+      buffer[ * size ] = '\0';
+      hb_fsClose( handle );
+   }
+   else
+      * size = 0;
+   return buffer;
+}
+
 HB_FUNC( FILETOSQLBINARY )
 {
    char *szFile = hb_parc(1);
-   const char *from;
-   int fh;
-   int iSize;
-   int iLen;
+   char *from;
    char *buffer;
-   char *FromBuffer;
+   int iSize;
 
-   fh = hb_fsOpen( (BYTE*)szFile,2 );
-   iSize = filelength( fh );
-   iLen = ( iSize*2 );
-   FromBuffer = (char*)hb_xgrab( iSize+1 );
-   hb_fsClose( fh );
-   from = (char*)filetoBuff( FromBuffer,szFile );
-   buffer = (char*)hb_xgrab( iLen+1 );
-   iSize = mysql_escape_string( buffer,from,iSize );
-   hb_retclen_buffer( (char*)buffer, iSize );
-   hb_xfree( FromBuffer );
+   from = filetoBuff( szFile, &iSize );
+   if( from )
+   {
+      buffer = ( char * ) hb_xgrab( iSize * 2 + 1 );
+      iSize = mysql_escape_string( buffer, from, iSize );
+      hb_retclen_buffer( buffer, iSize );
+      hb_xfree( from );
+   }
 }
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 6f948de6ba..bf5cb67b58 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -422,6 +422,7 @@ All these scripts accept command line switches:
 -xbgtk                  # link with xbgtk library (xBase GTK+ interface)
 -hwgui                  # link with HWGUI library (GTK+ interface)
 -l<libname>             # link with <libname> library
+-L<libpath>             # additional path to search for libraries
 -fmstat                 # link with the memory statistics lib
 -nofmstat               # do not link with the memory statistics lib (default)
 -[no]strip              # strip (no strip) binaries
diff --git a/harbour/include/hbapicls.h b/harbour/include/hbapicls.h
index b7529929cf..1ccb727882 100644
--- a/harbour/include/hbapicls.h
+++ b/harbour/include/hbapicls.h
@@ -121,8 +121,8 @@ HB_EXPORT extern const char * hb_objGetRealClsName( PHB_ITEM pObject, const char
 
 HB_EXPORT extern BOOL       hb_objHasMsg( PHB_ITEM pObject, const char * szString ); /* returns TRUE/FALSE whether szString is an existing message for object */
 HB_EXPORT extern BOOL       hb_objHasMessage( PHB_ITEM pObject, PHB_DYNS pMessage );
-HB_EXPORT extern void       hb_objSendMsg( PHB_ITEM pObj, const char *sMsg, ULONG ulArg, ... );
-HB_EXPORT extern void       hb_objSendMessage( PHB_ITEM pObj, PHB_DYNS pMessage, ULONG ulArg, ... );
+HB_EXPORT extern PHB_ITEM   hb_objSendMsg( PHB_ITEM pObj, const char *sMsg, ULONG ulArg, ... );
+HB_EXPORT extern PHB_ITEM   hb_objSendMessage( PHB_ITEM pObj, PHB_DYNS pMessage, ULONG ulArg, ... );
 
 
 /* Harbour equivalent for Clipper internal __mdCreate() */
diff --git a/harbour/source/compiler/cmdcheck.c b/harbour/source/compiler/cmdcheck.c
index 9c9635b61f..ff7ae6b598 100644
--- a/harbour/source/compiler/cmdcheck.c
+++ b/harbour/source/compiler/cmdcheck.c
@@ -839,6 +839,23 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, char *Args[] )
                         j = strlen( Args[i] );
                         continue;
 
+                     case '-':
+                     {
+                        int l = ++j;
+                        while( Args[i][j] && !HB_ISOPTSEP( Args[i][j] ) )
+                           j++;
+                        if( Args[i][l-1] == '-' && j-l == 7 &&
+                            memcmp( &Args[i][l], "version", 7 ) == 0 )
+                        {
+                           HB_COMP_PARAM->fLogo = TRUE;
+                           HB_COMP_PARAM->fQuiet = TRUE;
+                        }
+                        else
+                           hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_BADOPTION, &Args[i][l], NULL );
+                        if( Args[i][j] )
+                           ++j;
+                        continue;
+                     }
                      default:
                         Switch[2] = '\0';
                         hb_compChkEnvironVar( HB_COMP_PARAM, ( char * ) Switch );
diff --git a/harbour/source/compiler/hbusage.c b/harbour/source/compiler/hbusage.c
index 106b2e854a..656a205289 100644
--- a/harbour/source/compiler/hbusage.c
+++ b/harbour/source/compiler/hbusage.c
@@ -104,7 +104,7 @@ void hb_compPrintUsage( char * szSelf )
 
    int iLine;
 
-   printf( "\nSyntax:  %s <file[s][.prg]> [options]"
+   printf( "\nSyntax:  %s <file[s][.prg]|@file> [options]"
            "\n", szSelf );
 
    for( iLine = 0; iLine < ( int ) ( sizeof( szOptions ) / sizeof( char * ) ); iLine++ )
diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c
index 1ef5759db7..8f42add5d3 100644
--- a/harbour/source/vm/classes.c
+++ b/harbour/source/vm/classes.c
@@ -1861,7 +1861,7 @@ HB_EXPORT BOOL hb_objHasMsg( PHB_ITEM pObject, const char *szString )
    }
 }
 
-HB_EXPORT void hb_objSendMessage( PHB_ITEM pObject, PHB_DYNS pMsgSym, ULONG ulArg, ... )
+HB_EXPORT PHB_ITEM hb_objSendMessage( PHB_ITEM pObject, PHB_DYNS pMsgSym, ULONG ulArg, ... )
 {
    if( pObject && pMsgSym )
    {
@@ -1886,9 +1886,11 @@ HB_EXPORT void hb_objSendMessage( PHB_ITEM pObject, PHB_DYNS pMsgSym, ULONG ulAr
    {
       hb_errRT_BASE( EG_ARG, 3000, NULL, "__ObjSendMessage()", 0 );
    }
+
+   return hb_stackReturnItem();
 }
 
-HB_EXPORT void hb_objSendMsg( PHB_ITEM pObject, const char *sMsg, ULONG ulArg, ... )
+HB_EXPORT PHB_ITEM hb_objSendMsg( PHB_ITEM pObject, const char *sMsg, ULONG ulArg, ... )
 {
    hb_vmPushSymbol( hb_dynsymGet( sMsg )->pSymbol );
    hb_vmPush( pObject );
@@ -1905,6 +1907,8 @@ HB_EXPORT void hb_objSendMsg( PHB_ITEM pObject, const char *sMsg, ULONG ulArg, .
       va_end( ap );
    }
    hb_vmSend( (USHORT) ulArg );
+
+   return hb_stackReturnItem();
 }
 
 static PHB_DYNS hb_objGetMsgSym( PHB_ITEM pMessage )