From 4d13dd77f5c7f1186fb49cf9930d92c3176086cc Mon Sep 17 00:00:00 2001 From: Marek Paliwoda Date: Wed, 21 Nov 2007 16:45:29 +0000 Subject: [PATCH] --- harbour/ChangeLog | 180 +-- harbour/common.mak | 1344 +++++++++---------- harbour/contrib/apollo/make_b32.bat | 18 +- harbour/contrib/apollo/make_vc.bat | 18 +- harbour/contrib/firebird/make_b32.bat | 18 +- harbour/contrib/firebird/make_vc.bat | 18 +- harbour/contrib/freeimage/make_b32.bat | 20 +- harbour/contrib/freeimage/make_vc.bat | 20 +- harbour/contrib/gd/make_b32.bat | 18 +- harbour/contrib/gd/make_vc.bat | 24 +- harbour/contrib/make_all.mak | 127 ++ harbour/contrib/make_b32.bat | 21 - harbour/contrib/make_b32_all.bat | 11 +- harbour/contrib/make_vc.bat | 19 - harbour/contrib/make_vc_all.bat | 13 +- harbour/contrib/mtpl_b32.bat | 14 +- harbour/contrib/mtpl_b32.mak | 44 +- harbour/contrib/{mtpl.mak => mtpl_defs.mak} | 136 +- harbour/contrib/mtpl_ruls.mak | 74 + harbour/contrib/mtpl_vc.bat | 8 +- harbour/contrib/mtpl_vc.mak | 43 +- harbour/contrib/mysql/make_b32.bat | 18 +- harbour/contrib/mysql/make_vc.bat | 18 +- harbour/contrib/pdflib/make_b32.bat | 18 +- harbour/contrib/pdflib/make_vc.bat | 18 +- harbour/contrib/pgsql/make_b32.bat | 18 +- harbour/contrib/pgsql/make_vc.bat | 18 +- harbour/contrib/rdd_ads/make_b32.bat | 23 +- harbour/contrib/rdd_ads/make_vc.bat | 23 +- harbour/make_b32.mak | 380 +++--- harbour/make_gcc.mak | 160 +-- harbour/make_vc.mak | 686 +++++----- harbour/make_vcce.mak | 4 +- 33 files changed, 1822 insertions(+), 1750 deletions(-) create mode 100644 harbour/contrib/make_all.mak delete mode 100644 harbour/contrib/make_b32.bat delete mode 100644 harbour/contrib/make_vc.bat rename harbour/contrib/{mtpl.mak => mtpl_defs.mak} (83%) create mode 100644 harbour/contrib/mtpl_ruls.mak diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c717d17f4a..8d4c404489 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,103 +8,103 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ -2007-11-21 05:44 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) - * harbour/harbour-ce-spec - * harbour/harbour-w32-spec - * harbour/harbour.spec - * harbour/make_rpmce.sh - * harbour/make_rpmw32.sh - * harbour/make_rpm.sh - * changed --without adsrdd to --with adsrdd - now ADS* RDDs are not created by default +2007-11-21 17:30 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) + * harbour/contrib/make_all.mak + * harbour/contrib/make_b32_all.bat + * harbour/contrib/make_vc_all.bat + * harbour/contrib/mtpl_b32.bat + * harbour/contrib/mtpl_b32.mak + * harbour/contrib/mtpl_vc.bat + * harbour/contrib/mtpl_vc.mak + * Adopted to new make system + - Handling of PRG_HEADERS and C_HEADERS is implemented. + All common.mak files from contrib dirs should be modified to + add those defines if required. Only those headers defined in + PRG_HEADERS and C_HEADERS are installed into HB_INC_INSTALL + dir. If this dir is equal HB_ROOT those header are automaticaly + CLEANed. + - Changed "echo." to "echo" for Borland makefiles to enable + proper work on Win2003 - * harbour/make_rpm.sh - * set '--with adsrdd' when ${HOME}/ads/acesdk/ace.h or - /usr/local/ads/acesdk/ace.h exists + + harbour/contrib/mtpl_defs.mak + + Rules for Bcc and Msvc are unified now and placed into a + new makefile, "included" by mtpl_b32.mak and mtpl_vc.mak. - * harbour/contrib/rdd_ads/Makefile - + added ${HOME}/ads/acesdk/ace.h as alternative ace.h location + + harbour/contrib/mtpl_ruls.mak + - harbour/contrib/mtpl.mak + + Renamed to more verbose name - * harbour/source/rdd/hbsix/sxini.prg - ! fixed typo + - harbour/contrib/make_b32.bat + - harbour/contrib/make_vc.bat + - Removed - no longer neccesary -2007-11-20 19:09 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) - * harbour/bin/hb-func.sh - ! fixed using -o in hbcc + * harbour/contrib/libmisc/make_b32.bat + * harbour/contrib/libmisc/make_vc.bat + * harbour/contrib/libnf/delone.bat + * harbour/contrib/libnf/make_b32.bat + * harbour/contrib/libnf/make_vc.bat + * harbour/contrib/mysql/delone.bat + * harbour/contrib/mysql/make_b32.bat + * harbour/contrib/mysql/make_vc.bat + * harbour/contrib/odbc/a_mk_vc.bat + * harbour/contrib/odbc/delone.bat + * harbour/contrib/odbc/make_b32.bat + * harbour/contrib/odbc/make_vc.bat + * harbour/contrib/odbc/mhlp_b32.bat + * harbour/contrib/odbc/mhlp_vc.bat + * harbour/contrib/ole/delone.bat + * harbour/contrib/ole/make_b32.bat + * harbour/contrib/ole/make_vc.bat + * harbour/contrib/pdflib/delone.bat + * harbour/contrib/pdflib/make_b32.bat + * harbour/contrib/pdflib/make_vc.bat + * harbour/contrib/pgsql/delone.bat + * harbour/contrib/pgsql/make_b32.bat + * harbour/contrib/pgsql/make_vc.bat + * harbour/contrib/rdd_ads/delone.bat + * harbour/contrib/rdd_ads/make_b32.bat + * harbour/contrib/rdd_ads/make_vc.bat + * harbour/contrib/samples/delone.bat + * harbour/contrib/samples/make_b32.bat + * harbour/contrib/samples/make_vc.bat + * harbour/contrib/telepath/delone.bat + * harbour/contrib/telepath/make_b32.bat + * harbour/contrib/telepath/make_vc.bat + * harbour/contrib/tip/delone.bat + * harbour/contrib/tip/make_b32.bat + * harbour/contrib/tip/make_vc.bat + * harbour/contrib/win32/a_mk_bc.bat + * harbour/contrib/win32/delall.bat + * harbour/contrib/win32/delone.bat + * harbour/contrib/win32/make_b32.bat + * harbour/contrib/win32/make_vc.bat + * harbour/contrib/xhb/delone.bat + * harbour/contrib/xhb/make_b32.bat + * harbour/contrib/xhb/make_vc.bat + * Adopted to new make system - * harbour/contrib/rdd_ads/rddads.h - ! small hack for Linux compilation and compilers which do not set - unix macro + * harbour/common.mak + * harbour/make_b32.mak + * harbour/make_gcc.mak + * harbour/make_vc.mak + * harbour/make_vcce.mak + * Minor cleanup - * harbour/contrib/rdd_ads/Makefile - * added /usr/local/ads/acesdk to include directory list - Viktor the side effect of removing ace.h from our repository is - blocking ADS* RDDs compilation by people who do not have ACE - installed - I expect it will be serious problem in creating BETA4 - binaries because not all people who create them have ACE installed - or even want to install it and without these RDDs for many users - new Harbour version will be unusable. - - * harbour/source/rtl/seconds.c - ! fixed stupid typo in milliseconds calculation - - * harbour/contrib/xhb/hbchksum.c - * harbour/contrib/xhb/hbcomprs.c - * harbour/contrib/xhb/hbcomprs.h - ! use hb_retclenAdopt() instead of hb_retclenAdoptRaw() - + svn:keywords Id - svn:eol-style native - TOFIX - these files have to be removed or changed to avoid name conflicts - with ZLIB - personally I vote to add real ZLIB wrapper and only xHarbour - compatible .prg functions when they are necessary. Probably only: - HB_COMPRESS(), HB_UNCOMPRESS(), HB_COMPRESSBUFLEN() - and maybe: - HB_COMPRESSERROR(), HB_COMPRESSERRORDESC() - In xHarbour: - HB_CHECKSUM( [, ] ) -> - is exactly the same function as in Harbour: - HB_ADLER32( [, ] ) -> - with the exception to bug with negative values fixed in Harbour only. - -2007-11-20 17:02 UTC+0100 Miguel Angel Marchuet Frutos - * contrib/xhb/common.mak - + Added some missing lines (suggested by Juan Gálvez) - -2007-11-20 13:45 UTC+0100 Miguel Angel Marchuet Frutos - * contrib/bmdbfcdx/bmdbfcdx1.c - * synced with dbfcdx as nedded - -2007-11-19 20:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) - * contrib/examples/dbu/bld_b32.bat - * Now the non-GNU build batch file will look for - DBU source in the original CA-Cl*pper installation, - if specified (using 'set CLIPPER_DIR=C:\CLIPPER5\'). - -2007-11-19 20:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) - + contrib/rdd_ads/test - + contrib/rdd_ads/test/testmg.prg - - contrib/rdd_ads/testmg.prg - * Moved. - - * contrib/rdd_ads/make_b32.bat - * contrib/rdd_ads/make_vc.bat - * contrib/rdd_ads/adsmgmnt.c - - contrib/rdd_ads/ace.h - + Non-GNU make files standardized. You'll need to set these envvars + + Non-GNU make files standardized. You'll need to set these envvars to tell the package (Advantage Client Engine) location (and version): set ADS_DIR=C:\ads\acesdk set ADS_VER=810 - * ADS_VER is optional, if not speficied, zero will be + * ADS_VER is optional, if not speficied, zero will be returned as "index sort buffer size" by AdsMgGetConfigInfo(). - ; The exact .dll location inside the package dir will be + ; The exact .dll location inside the package dir will be detected (tested 6.11-8.10) - Now ADS header is not included anymore in Harbour. - Notice that this header file is a copyrighted file where such - distribution is not permitted. Anyhow, distributing other + Notice that this header file is a copyrighted file where such + distribution is not permitted. Anyhow, distributing other packages headers is not good practice anyway. * contrib/rdd_ads/rddads.h - * WatcomC / LCC hack implemented outside ace.h. Please test + * WatcomC / LCC hack implemented outside ace.h. Please test this as I don't have any of these compilers. 2007-11-19 19:03 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) @@ -126,7 +126,7 @@ ; Thanks to Marek. * utils/hbmake/hbmutils.prg - ! Some untested fixes to hbmake. If someone + ! Some untested fixes to hbmake. If someone uses this tool, pls send reports. - contrib/mkall_b32.bat @@ -156,9 +156,9 @@ 'Call to function 'AdsApplicationExit' with no prototype in function ...' + contrib/rdd_ads/unixutils.h - + Added dummy header to fix compilation under + + Added dummy header to fix compilation under Linux, using the original ads.h headers. - Not tested. Supposed to replace the workaround + Not tested. Supposed to replace the workaround currently in local ads.h where '#include "unixutils.h"' is commented out. @@ -239,7 +239,7 @@ * contrib/bmdbfcdx/make_b32.bat * contrib/bmdbfcdx/make_vc.bat % Using the batch file templates. - + Some other additions and fixes related to make it easy + + Some other additions and fixes related to make it easy to specifiy 3rd party package locations. These envvars can be used for our libs: set APOLLO_DIR=C:\Apollo @@ -285,18 +285,18 @@ + Minor fix (from xhb) * source/rtl/errorint.c - ! Defaulting all string parameters to "" when they are NULL + ! Defaulting all string parameters to "" when they are NULL to avoid any potential problems later in the function. * source/rtl/hbgtcore.c % Passing NULL instead of "" in hb_errInternal() calls. * source/vm/itemapi.c - ! Internal error is lauched in case the parameters passed + ! Internal error is lauched in case the parameters passed to hb_itemPutCLConst() are violating string item rules. Thanks for Mindaugas for the suggestion. - TOFIX: Since this violation will most probably happen in - contrib/win32 OLE code, we'll need to fix that + TOFIX: Since this violation will most probably happen in + contrib/win32 OLE code, we'll need to fix that code too. * utils/hbmake/hbmake.prg diff --git a/harbour/common.mak b/harbour/common.mak index e52d9eef8f..b48cd702f0 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -3,9 +3,7 @@ # #********************************************************** -# # Common makefile.bc and makefile.vc definitions -# #********************************************************** # @@ -73,31 +71,31 @@ DLL_OBJ_DIR = $(DLL_ROOTDIR)\$(HB_CC_NAME) # Targets Destination Directories HB_DEST_DIRS = \ - $(BIN_DIR) \ - $(OBJ_DIR) \ - $(LIB_DIR) \ - \ - $(DLL_ROOTDIR) \ - $(DLL_OBJ_DIR) + $(BIN_DIR) \ + $(OBJ_DIR) \ + $(LIB_DIR) \ + \ + $(DLL_ROOTDIR) \ + $(DLL_OBJ_DIR) -MAIN_DIR = source\main +MAIN_DIR = source\main COMMON_DIR = source\common COMPILER_DIR = source\compiler -PP_DIR = source\pp -VM_DIR = source\vm -RTL_DIR = source\rtl +PP_DIR = source\pp +VM_DIR = source\vm +RTL_DIR = source\rtl MACRO_DIR = source\macro DEBUG_DIR = source\debug -LANG_DIR = source\lang +LANG_DIR = source\lang CODEPAGE_DIR = source\codepage -PCRE_DIR = source\hbpcre -RDD_DIR = source\rdd +PCRE_DIR = source\hbpcre +RDD_DIR = source\rdd NULSYS_DIR = source\rdd\nulsys DBFNTX_DIR = source\rdd\dbfntx DBFCDX_DIR = source\rdd\dbfcdx DBFFPT_DIR = source\rdd\dbffpt HBSIX_DIR = source\rdd\hbsix -HSX_DIR = source\rdd\hsx +HSX_DIR = source\rdd\hsx USRRDD_DIR = source\rdd\usrrdd GTCGI_DIR = source\rtl\gtcgi @@ -115,7 +113,7 @@ GTCRS_DIR = source\rtl\gtcrs GTSLN_DIR = source\rtl\gtsln GTXWC_DIR = source\rtl\gtxwc -HBPP_DIR = utils\hbpp +HBPP_DIR = utils\hbpp HBPPTEST_DIR = utils\hbpptest HBRUN_DIR = utils\hbrun HBDOT_DIR = utils\hbdot @@ -179,7 +177,7 @@ $(ALL_EXE_SRC_DIRS_TMP)\ ALL_LIB_SRC_DIRS = $(ALL_LIB_SRC_DIRS_TMP: =) ALL_EXE_SRC_DIRS = $(ALL_EXE_SRC_DIRS_TMP: =) -ALL_SRC_DIRS = $(ALL_SRC_DIRS_TMP: =) +ALL_SRC_DIRS = $(ALL_SRC_DIRS_TMP: =) #********************************************************** #********************************************************** @@ -191,21 +189,21 @@ ALL_SRC_DIRS = $(ALL_SRC_DIRS_TMP: =) 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) +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) +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) +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) +HSX_LIB = $(LIB_DIR)\$(LIBPREF)hsx$(LIBEXT) USRRDD_LIB = $(LIB_DIR)\$(LIBPREF)usrrdd$(LIBEXT) GTCGI_LIB = $(LIB_DIR)\$(LIBPREF)gtcgi$(LIBEXT) @@ -226,7 +224,7 @@ HARBOUR_EXE = $(BIN_DIR)\harbour$(EXEEXT) # required (intermediate) utility # to generate pptable.c HBPPGEN_EXE = $(BIN_DIR)\hbppgen$(EXEEXT) -HBPP_EXE = $(BIN_DIR)\hbpp$(EXEEXT) +HBPP_EXE = $(BIN_DIR)\hbpp$(EXEEXT) HBPPTEST_EXE = $(BIN_DIR)\hbpptest$(EXEEXT) HBRUN_EXE = $(BIN_DIR)\hbrun$(EXEEXT) HBDOT_EXE = $(BIN_DIR)\hbdot$(EXEEXT) @@ -251,9 +249,9 @@ HB_STD_GT = $(GTCGI_LIB) $(GTSTD_LIB) $(GTPCA_LIB) # WinOS's GT driver list # HB_WINOS_GT = \ - $(GTWIN_LIB) \ - $(GTWVT_LIB) \ - $(GTGUI_LIB) + $(GTWIN_LIB) \ + $(GTWVT_LIB) \ + $(GTGUI_LIB) !ifdef HB_GT_LIST HB_GT_LIBS = $(HB_STD_GT) $(HB_GT_LIST) @@ -273,24 +271,24 @@ HB_GT_LIB = gtstd # Standard Libs for HB-based executables STANDARD_STATIC_HBLIBS = \ - $(COMMON_LIB) \ - $(PP_LIB) \ - $(COMPILER_LIB) \ - $(VM_LIB) \ - $(RTL_LIB) \ - $(HB_GT_LIBS) \ - $(LANG_LIB) \ - $(CODEPAGE_LIB) \ - $(PCRE_LIB) \ - $(RDD_LIB) \ - $(MACRO_LIB) \ - $(DEBUG_LIB) \ - $(DBFNTX_LIB) \ - $(DBFCDX_LIB) \ - $(DBFFPT_LIB) \ - $(HBSIX_LIB) \ - $(HSX_LIB) \ - $(USRRDD_LIB) \ + $(COMMON_LIB) \ + $(PP_LIB) \ + $(COMPILER_LIB) \ + $(VM_LIB) \ + $(RTL_LIB) \ + $(HB_GT_LIBS) \ + $(LANG_LIB) \ + $(CODEPAGE_LIB) \ + $(PCRE_LIB) \ + $(RDD_LIB) \ + $(MACRO_LIB) \ + $(DEBUG_LIB) \ + $(DBFNTX_LIB) \ + $(DBFCDX_LIB) \ + $(DBFFPT_LIB) \ + $(HBSIX_LIB) \ + $(HSX_LIB) \ + $(USRRDD_LIB) \ #********************************************************** #********************************************************** @@ -301,104 +299,104 @@ STANDARD_STATIC_HBLIBS = \ #********************************************************** COMMON_LIB_OBJS = \ - $(OBJ_DIR)\expropt1$(OBJEXT) \ - $(OBJ_DIR)\expropt2$(OBJEXT) \ - $(OBJ_DIR)\hbarch$(OBJEXT) \ - $(OBJ_DIR)\hbfhnd$(OBJEXT) \ - $(OBJ_DIR)\hbfsapi$(OBJEXT) \ - $(OBJ_DIR)\hbfopen$(OBJEXT) \ - $(OBJ_DIR)\hbgete$(OBJEXT) \ - $(OBJ_DIR)\hbwince$(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) + $(OBJ_DIR)\expropt1$(OBJEXT) \ + $(OBJ_DIR)\expropt2$(OBJEXT) \ + $(OBJ_DIR)\hbarch$(OBJEXT) \ + $(OBJ_DIR)\hbfhnd$(OBJEXT) \ + $(OBJ_DIR)\hbfsapi$(OBJEXT) \ + $(OBJ_DIR)\hbfopen$(OBJEXT) \ + $(OBJ_DIR)\hbgete$(OBJEXT) \ + $(OBJ_DIR)\hbwince$(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$(OBJEXT) \ - $(OBJ_DIR)\ppcore$(OBJEXT) \ - $(OBJ_DIR)\pplib$(OBJEXT) \ - $(OBJ_DIR)\pplib2$(OBJEXT) \ - $(OBJ_DIR)\pplib3$(OBJEXT) \ + $(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$(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)\gencobj$(OBJEXT) \ - $(OBJ_DIR)\genobj32$(OBJEXT) \ - $(OBJ_DIR)\genhrb$(OBJEXT) \ - $(OBJ_DIR)\expropta$(OBJEXT) \ - $(OBJ_DIR)\exproptb$(OBJEXT) \ + $(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)\gencobj$(OBJEXT) \ + $(OBJ_DIR)\genobj32$(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$(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)\vm$(OBJEXT) \ - $(OBJ_DIR)\harbinit$(OBJEXT) \ + $(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)\vm$(OBJEXT) \ + $(OBJ_DIR)\harbinit$(OBJEXT) \ # Specific VM Objects for building STATIC library VM_STATIC_LIB_OBJS = \ - $(OBJ_DIR)\mainstd$(OBJEXT) \ - $(OBJ_DIR)\mainwin$(OBJEXT) + $(OBJ_DIR)\mainstd$(OBJEXT) \ + $(OBJ_DIR)\mainwin$(OBJEXT) # Specific VM Objects for building SHARED (DLL) library VM_SHARED_LIB_OBJS = \ - $(OBJ_DIR)\maindllh$(OBJEXT) \ + $(OBJ_DIR)\maindllh$(OBJEXT) \ # All VM Objects for building STATIC library VM_LIB_OBJS = $(VM_COMMON_LIB_OBJS) $(VM_STATIC_LIB_OBJS) @@ -407,517 +405,517 @@ 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$(OBJEXT) \ - $(OBJ_DIR)\maindll$(OBJEXT) \ + $(OBJ_DIR)\maindllp$(OBJEXT) \ + $(OBJ_DIR)\maindll$(OBJEXT) \ #********************************************************** RTL_LIB_OBJS = \ - $(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)\gtchrmap$(OBJEXT) \ - $(OBJ_DIR)\gtapiu$(OBJEXT) \ - $(OBJ_DIR)\gtclip$(OBJEXT) \ - $(OBJ_DIR)\gtfunc$(OBJEXT) \ - $(OBJ_DIR)\gtkbstat$(OBJEXT) \ - $(OBJ_DIR)\gtsys$(OBJEXT) \ - $(OBJ_DIR)\gttone$(OBJEXT) \ - $(OBJ_DIR)\gx$(OBJEXT) \ - $(OBJ_DIR)\hardcr$(OBJEXT) \ - $(OBJ_DIR)\hbadler$(OBJEXT) \ - $(OBJ_DIR)\hbbit$(OBJEXT) \ - $(OBJ_DIR)\hbcrc$(OBJEXT) \ - $(OBJ_DIR)\hbhex$(OBJEXT) \ - $(OBJ_DIR)\hbmd5$(OBJEXT) \ - $(OBJ_DIR)\hbffind$(OBJEXT) \ - $(OBJ_DIR)\hbfile$(OBJEXT) \ - $(OBJ_DIR)\hbgtcore$(OBJEXT) \ - $(OBJ_DIR)\hbinet$(OBJEXT) \ - $(OBJ_DIR)\hbstrsh$(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)\mouse53$(OBJEXT) \ - $(OBJ_DIR)\mouseapi$(OBJEXT) \ - $(OBJ_DIR)\mousex$(OBJEXT) \ - $(OBJ_DIR)\mtran$(OBJEXT) \ - $(OBJ_DIR)\natmsg$(OBJEXT) \ - $(OBJ_DIR)\natmsgu$(OBJEXT) \ - $(OBJ_DIR)\net$(OBJEXT) \ - $(OBJ_DIR)\oemansi$(OBJEXT) \ - $(OBJ_DIR)\oemansix$(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)\secondfs$(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)\tscalara$(OBJEXT) \ - $(OBJ_DIR)\tscalarb$(OBJEXT) \ - $(OBJ_DIR)\tscalarc$(OBJEXT) \ - $(OBJ_DIR)\tscalard$(OBJEXT) \ - $(OBJ_DIR)\tscalarh$(OBJEXT) \ - $(OBJ_DIR)\tscalarl$(OBJEXT) \ - $(OBJ_DIR)\tscalarn$(OBJEXT) \ - $(OBJ_DIR)\tscalarp$(OBJEXT) \ - $(OBJ_DIR)\tscalars$(OBJEXT) \ - $(OBJ_DIR)\tscalaru$(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$(OBJEXT) \ - $(OBJ_DIR)\adir$(OBJEXT) \ - $(OBJ_DIR)\alert$(OBJEXT) \ - $(OBJ_DIR)\altd$(OBJEXT) \ - $(OBJ_DIR)\browdb$(OBJEXT) \ - $(OBJ_DIR)\browdbx$(OBJEXT) \ - $(OBJ_DIR)\browse$(OBJEXT) \ - $(OBJ_DIR)\checkbox$(OBJEXT) \ - $(OBJ_DIR)\color53$(OBJEXT) \ - $(OBJ_DIR)\dbedit$(OBJEXT) \ - $(OBJ_DIR)\devoutp$(OBJEXT) \ - $(OBJ_DIR)\dircmd$(OBJEXT) \ - $(OBJ_DIR)\einstvar$(OBJEXT) \ - $(OBJ_DIR)\errorsys$(OBJEXT) \ - $(OBJ_DIR)\fieldbl$(OBJEXT) \ - $(OBJ_DIR)\getlist$(OBJEXT) \ - $(OBJ_DIR)\getsys$(OBJEXT) \ - $(OBJ_DIR)\getsys53$(OBJEXT) \ - $(OBJ_DIR)\gui$(OBJEXT) \ - $(OBJ_DIR)\hbini$(OBJEXT) \ - $(OBJ_DIR)\input$(OBJEXT) \ - $(OBJ_DIR)\listbox$(OBJEXT) \ - $(OBJ_DIR)\memoedit$(OBJEXT) \ - $(OBJ_DIR)\memvarbl$(OBJEXT) \ - $(OBJ_DIR)\menuto$(OBJEXT) \ - $(OBJ_DIR)\menusys$(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)\scrollbr$(OBJEXT) \ - $(OBJ_DIR)\setfunc$(OBJEXT) \ - $(OBJ_DIR)\setta$(OBJEXT) \ - $(OBJ_DIR)\symbol$(OBJEXT) \ - $(OBJ_DIR)\tbcolumn$(OBJEXT) \ - $(OBJ_DIR)\tbrowse$(OBJEXT) \ - $(OBJ_DIR)\tbrowsys$(OBJEXT) \ - $(OBJ_DIR)\tclass$(OBJEXT) \ - $(OBJ_DIR)\teditor$(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)\tmenusys$(OBJEXT) \ - $(OBJ_DIR)\tobject$(OBJEXT) \ - $(OBJ_DIR)\tpopup$(OBJEXT) \ - $(OBJ_DIR)\treport$(OBJEXT) \ - $(OBJ_DIR)\tscalar$(OBJEXT) \ - $(OBJ_DIR)\ttextlin$(OBJEXT) \ - $(OBJ_DIR)\ttopbar$(OBJEXT) \ - $(OBJ_DIR)\typefile$(OBJEXT) \ - $(OBJ_DIR)\typefilx$(OBJEXT) \ - $(OBJ_DIR)\valtoexp$(OBJEXT) \ - $(OBJ_DIR)\wait$(OBJEXT) \ + $(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)\gtchrmap$(OBJEXT) \ + $(OBJ_DIR)\gtapiu$(OBJEXT) \ + $(OBJ_DIR)\gtclip$(OBJEXT) \ + $(OBJ_DIR)\gtfunc$(OBJEXT) \ + $(OBJ_DIR)\gtkbstat$(OBJEXT) \ + $(OBJ_DIR)\gtsys$(OBJEXT) \ + $(OBJ_DIR)\gttone$(OBJEXT) \ + $(OBJ_DIR)\gx$(OBJEXT) \ + $(OBJ_DIR)\hardcr$(OBJEXT) \ + $(OBJ_DIR)\hbadler$(OBJEXT) \ + $(OBJ_DIR)\hbbit$(OBJEXT) \ + $(OBJ_DIR)\hbcrc$(OBJEXT) \ + $(OBJ_DIR)\hbhex$(OBJEXT) \ + $(OBJ_DIR)\hbmd5$(OBJEXT) \ + $(OBJ_DIR)\hbffind$(OBJEXT) \ + $(OBJ_DIR)\hbfile$(OBJEXT) \ + $(OBJ_DIR)\hbgtcore$(OBJEXT) \ + $(OBJ_DIR)\hbinet$(OBJEXT) \ + $(OBJ_DIR)\hbstrsh$(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)\mouse53$(OBJEXT) \ + $(OBJ_DIR)\mouseapi$(OBJEXT) \ + $(OBJ_DIR)\mousex$(OBJEXT) \ + $(OBJ_DIR)\mtran$(OBJEXT) \ + $(OBJ_DIR)\natmsg$(OBJEXT) \ + $(OBJ_DIR)\natmsgu$(OBJEXT) \ + $(OBJ_DIR)\net$(OBJEXT) \ + $(OBJ_DIR)\oemansi$(OBJEXT) \ + $(OBJ_DIR)\oemansix$(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)\secondfs$(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)\tscalara$(OBJEXT) \ + $(OBJ_DIR)\tscalarb$(OBJEXT) \ + $(OBJ_DIR)\tscalarc$(OBJEXT) \ + $(OBJ_DIR)\tscalard$(OBJEXT) \ + $(OBJ_DIR)\tscalarh$(OBJEXT) \ + $(OBJ_DIR)\tscalarl$(OBJEXT) \ + $(OBJ_DIR)\tscalarn$(OBJEXT) \ + $(OBJ_DIR)\tscalarp$(OBJEXT) \ + $(OBJ_DIR)\tscalars$(OBJEXT) \ + $(OBJ_DIR)\tscalaru$(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$(OBJEXT) \ + $(OBJ_DIR)\adir$(OBJEXT) \ + $(OBJ_DIR)\alert$(OBJEXT) \ + $(OBJ_DIR)\altd$(OBJEXT) \ + $(OBJ_DIR)\browdb$(OBJEXT) \ + $(OBJ_DIR)\browdbx$(OBJEXT) \ + $(OBJ_DIR)\browse$(OBJEXT) \ + $(OBJ_DIR)\checkbox$(OBJEXT) \ + $(OBJ_DIR)\color53$(OBJEXT) \ + $(OBJ_DIR)\dbedit$(OBJEXT) \ + $(OBJ_DIR)\devoutp$(OBJEXT) \ + $(OBJ_DIR)\dircmd$(OBJEXT) \ + $(OBJ_DIR)\einstvar$(OBJEXT) \ + $(OBJ_DIR)\errorsys$(OBJEXT) \ + $(OBJ_DIR)\fieldbl$(OBJEXT) \ + $(OBJ_DIR)\getlist$(OBJEXT) \ + $(OBJ_DIR)\getsys$(OBJEXT) \ + $(OBJ_DIR)\getsys53$(OBJEXT) \ + $(OBJ_DIR)\gui$(OBJEXT) \ + $(OBJ_DIR)\hbini$(OBJEXT) \ + $(OBJ_DIR)\input$(OBJEXT) \ + $(OBJ_DIR)\listbox$(OBJEXT) \ + $(OBJ_DIR)\memoedit$(OBJEXT) \ + $(OBJ_DIR)\memvarbl$(OBJEXT) \ + $(OBJ_DIR)\menuto$(OBJEXT) \ + $(OBJ_DIR)\menusys$(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)\scrollbr$(OBJEXT) \ + $(OBJ_DIR)\setfunc$(OBJEXT) \ + $(OBJ_DIR)\setta$(OBJEXT) \ + $(OBJ_DIR)\symbol$(OBJEXT) \ + $(OBJ_DIR)\tbcolumn$(OBJEXT) \ + $(OBJ_DIR)\tbrowse$(OBJEXT) \ + $(OBJ_DIR)\tbrowsys$(OBJEXT) \ + $(OBJ_DIR)\tclass$(OBJEXT) \ + $(OBJ_DIR)\teditor$(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)\tmenusys$(OBJEXT) \ + $(OBJ_DIR)\tobject$(OBJEXT) \ + $(OBJ_DIR)\tpopup$(OBJEXT) \ + $(OBJ_DIR)\treport$(OBJEXT) \ + $(OBJ_DIR)\tscalar$(OBJEXT) \ + $(OBJ_DIR)\ttextlin$(OBJEXT) \ + $(OBJ_DIR)\ttopbar$(OBJEXT) \ + $(OBJ_DIR)\typefile$(OBJEXT) \ + $(OBJ_DIR)\typefilx$(OBJEXT) \ + $(OBJ_DIR)\valtoexp$(OBJEXT) \ + $(OBJ_DIR)\wait$(OBJEXT) \ #********************************************************** MACRO_LIB_OBJS = \ - $(OBJ_DIR)\macroy$(OBJEXT) \ - $(OBJ_DIR)\macroa$(OBJEXT) \ - $(OBJ_DIR)\macrob$(OBJEXT) \ - $(OBJ_DIR)\macrolex$(OBJEXT) \ + $(OBJ_DIR)\macroy$(OBJEXT) \ + $(OBJ_DIR)\macroa$(OBJEXT) \ + $(OBJ_DIR)\macrob$(OBJEXT) \ + $(OBJ_DIR)\macrolex$(OBJEXT) \ #********************************************************** DEBUG_LIB_OBJS = \ - $(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) \ + $(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$(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) \ + $(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$(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) \ + $(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$(OBJEXT) \ - $(OBJ_DIR)\cpbgiso$(OBJEXT) \ - $(OBJ_DIR)\cpbgmik$(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)\cpesmwin$(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)\cpsk852$(OBJEXT) \ - $(OBJ_DIR)\cpskiso$(OBJEXT) \ - $(OBJ_DIR)\cpskkam$(OBJEXT) \ - $(OBJ_DIR)\cpskwin$(OBJEXT) \ - $(OBJ_DIR)\cpsl437$(OBJEXT) \ - $(OBJ_DIR)\cpsl852$(OBJEXT) \ - $(OBJ_DIR)\cpsliso$(OBJEXT) \ - $(OBJ_DIR)\cpslwin$(OBJEXT) \ - $(OBJ_DIR)\cpsrwin$(OBJEXT) \ - $(OBJ_DIR)\cpsv850$(OBJEXT) \ - $(OBJ_DIR)\cpsvclip$(OBJEXT) \ - $(OBJ_DIR)\cpsvwin$(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) \ - $(OBJ_DIR)\ucmik$(OBJEXT) \ + $(OBJ_DIR)\cpbg866$(OBJEXT) \ + $(OBJ_DIR)\cpbgiso$(OBJEXT) \ + $(OBJ_DIR)\cpbgmik$(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)\cpesmwin$(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)\cpsk852$(OBJEXT) \ + $(OBJ_DIR)\cpskiso$(OBJEXT) \ + $(OBJ_DIR)\cpskkam$(OBJEXT) \ + $(OBJ_DIR)\cpskwin$(OBJEXT) \ + $(OBJ_DIR)\cpsl437$(OBJEXT) \ + $(OBJ_DIR)\cpsl852$(OBJEXT) \ + $(OBJ_DIR)\cpsliso$(OBJEXT) \ + $(OBJ_DIR)\cpslwin$(OBJEXT) \ + $(OBJ_DIR)\cpsrwin$(OBJEXT) \ + $(OBJ_DIR)\cpsv850$(OBJEXT) \ + $(OBJ_DIR)\cpsvclip$(OBJEXT) \ + $(OBJ_DIR)\cpsvwin$(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) \ + $(OBJ_DIR)\ucmik$(OBJEXT) \ #********************************************************** RDD_LIB_OBJS = \ - $(OBJ_DIR)\dbcmd$(OBJEXT) \ - $(OBJ_DIR)\dbcmd53$(OBJEXT) \ - $(OBJ_DIR)\dbcmdx$(OBJEXT) \ - $(OBJ_DIR)\dbdrop$(OBJEXT) \ - $(OBJ_DIR)\dbexists$(OBJEXT) \ - $(OBJ_DIR)\fieldhb$(OBJEXT) \ - $(OBJ_DIR)\hbdbsort$(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)\dbsql$(OBJEXT) \ - $(OBJ_DIR)\sdf1$(OBJEXT) \ - $(OBJ_DIR)\rddinfo$(OBJEXT) \ - \ - $(OBJ_DIR)\dbdelim$(OBJEXT) \ - $(OBJ_DIR)\dbsdf$(OBJEXT) \ - $(OBJ_DIR)\dbjoin$(OBJEXT) \ - $(OBJ_DIR)\dbjoinx$(OBJEXT) \ - $(OBJ_DIR)\dbtotal$(OBJEXT) \ - $(OBJ_DIR)\dbtotalx$(OBJEXT) \ - $(OBJ_DIR)\dbfuncs$(OBJEXT) \ - $(OBJ_DIR)\dbfuncsx$(OBJEXT) \ - $(OBJ_DIR)\dblist$(OBJEXT) \ - $(OBJ_DIR)\dblistx$(OBJEXT) \ - $(OBJ_DIR)\dbsort$(OBJEXT) \ - $(OBJ_DIR)\dbsortx$(OBJEXT) \ - $(OBJ_DIR)\dbstrux$(OBJEXT) \ - $(OBJ_DIR)\dbstruxx$(OBJEXT) \ - $(OBJ_DIR)\dbupdat$(OBJEXT) \ - $(OBJ_DIR)\dbupdatx$(OBJEXT) \ - $(OBJ_DIR)\rddord$(OBJEXT) \ - $(OBJ_DIR)\rddsys$(OBJEXT) \ + $(OBJ_DIR)\dbcmd$(OBJEXT) \ + $(OBJ_DIR)\dbcmd53$(OBJEXT) \ + $(OBJ_DIR)\dbcmdx$(OBJEXT) \ + $(OBJ_DIR)\dbdrop$(OBJEXT) \ + $(OBJ_DIR)\dbexists$(OBJEXT) \ + $(OBJ_DIR)\fieldhb$(OBJEXT) \ + $(OBJ_DIR)\hbdbsort$(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)\dbsql$(OBJEXT) \ + $(OBJ_DIR)\sdf1$(OBJEXT) \ + $(OBJ_DIR)\rddinfo$(OBJEXT) \ + \ + $(OBJ_DIR)\dbdelim$(OBJEXT) \ + $(OBJ_DIR)\dbsdf$(OBJEXT) \ + $(OBJ_DIR)\dbjoin$(OBJEXT) \ + $(OBJ_DIR)\dbjoinx$(OBJEXT) \ + $(OBJ_DIR)\dbtotal$(OBJEXT) \ + $(OBJ_DIR)\dbtotalx$(OBJEXT) \ + $(OBJ_DIR)\dbfuncs$(OBJEXT) \ + $(OBJ_DIR)\dbfuncsx$(OBJEXT) \ + $(OBJ_DIR)\dblist$(OBJEXT) \ + $(OBJ_DIR)\dblistx$(OBJEXT) \ + $(OBJ_DIR)\dbsort$(OBJEXT) \ + $(OBJ_DIR)\dbsortx$(OBJEXT) \ + $(OBJ_DIR)\dbstrux$(OBJEXT) \ + $(OBJ_DIR)\dbstruxx$(OBJEXT) \ + $(OBJ_DIR)\dbupdat$(OBJEXT) \ + $(OBJ_DIR)\dbupdatx$(OBJEXT) \ + $(OBJ_DIR)\rddord$(OBJEXT) \ + $(OBJ_DIR)\rddsys$(OBJEXT) \ #********************************************************** NULSYS_LIB_OBJS = \ - $(OBJ_DIR)\nulsys$(OBJEXT) + $(OBJ_DIR)\nulsys$(OBJEXT) #********************************************************** DBFNTX_LIB_OBJS = \ - $(OBJ_DIR)\dbfntx1$(OBJEXT) \ - $(OBJ_DIR)\dbfntx0$(OBJEXT) \ + $(OBJ_DIR)\dbfntx1$(OBJEXT) \ + $(OBJ_DIR)\dbfntx0$(OBJEXT) \ #********************************************************** DBFCDX_LIB_OBJS = \ - $(OBJ_DIR)\dbfcdx1$(OBJEXT) \ - $(OBJ_DIR)\sixcdx1$(OBJEXT) \ + $(OBJ_DIR)\dbfcdx1$(OBJEXT) \ + $(OBJ_DIR)\sixcdx1$(OBJEXT) \ #********************************************************** DBFFPT_LIB_OBJS = \ - $(OBJ_DIR)\dbffpt1$(OBJEXT) \ + $(OBJ_DIR)\dbffpt1$(OBJEXT) \ #********************************************************** HBSIX_LIB_OBJS = \ - $(OBJ_DIR)\sxcompr$(OBJEXT) \ - $(OBJ_DIR)\sxcrypt$(OBJEXT) \ - $(OBJ_DIR)\sxdate$(OBJEXT) \ + $(OBJ_DIR)\sxcompr$(OBJEXT) \ + $(OBJ_DIR)\sxcrypt$(OBJEXT) \ + $(OBJ_DIR)\sxdate$(OBJEXT) \ #********************************************************** HSX_LIB_OBJS = \ - $(OBJ_DIR)\hsx$(OBJEXT) \ - $(OBJ_DIR)\cftsfunc$(OBJEXT) \ + $(OBJ_DIR)\hsx$(OBJEXT) \ + $(OBJ_DIR)\cftsfunc$(OBJEXT) \ #********************************************************** USRRDD_LIB_OBJS = \ - $(OBJ_DIR)\usrrdd$(OBJEXT) \ + $(OBJ_DIR)\usrrdd$(OBJEXT) \ #********************************************************** GTCGI_LIB_OBJS = \ - $(OBJ_DIR)\gtcgi$(OBJEXT) \ + $(OBJ_DIR)\gtcgi$(OBJEXT) \ #********************************************************** GTSTD_LIB_OBJS = \ - $(OBJ_DIR)\gtstd$(OBJEXT) \ + $(OBJ_DIR)\gtstd$(OBJEXT) \ #********************************************************** GTDOS_LIB_OBJS = \ - $(OBJ_DIR)\gtdos$(OBJEXT) \ + $(OBJ_DIR)\gtdos$(OBJEXT) \ #********************************************************** GTPCA_LIB_OBJS = \ - $(OBJ_DIR)\gtpca$(OBJEXT) \ + $(OBJ_DIR)\gtpca$(OBJEXT) \ #********************************************************** GTWIN_LIB_OBJS = \ - $(OBJ_DIR)\gtwin$(OBJEXT) \ + $(OBJ_DIR)\gtwin$(OBJEXT) \ #********************************************************** GTWVT_LIB_OBJS = \ - $(OBJ_DIR)\gtwvt$(OBJEXT) \ + $(OBJ_DIR)\gtwvt$(OBJEXT) \ #********************************************************** GTGUI_LIB_COMMON_OBJS = \ - $(OBJ_DIR)\gtgui$(OBJEXT) \ + $(OBJ_DIR)\gtgui$(OBJEXT) \ GTGUI_LIB_STATIC_OBJS = \ - $(OBJ_DIR)\gtdef$(OBJEXT) \ + $(OBJ_DIR)\gtdef$(OBJEXT) \ GTGUI_LIB_SHARED_OBJS = \ @@ -927,133 +925,133 @@ GTGUI_DLL_OBJS = $(GTGUI_LIB_COMMON_OBJS) $(GTGUI_LIB_SHARED_OBJS) #********************************************************** GTTRM_LIB_OBJS = \ - $(OBJ_DIR)\gttrm$(OBJEXT) \ + $(OBJ_DIR)\gttrm$(OBJEXT) \ #********************************************************** GTCRS_LIB_OBJS = \ - $(OBJ_DIR)\gtcrs$(OBJEXT) \ + $(OBJ_DIR)\gtcrs$(OBJEXT) \ #********************************************************** GTSLN_LIB_OBJS = \ - $(OBJ_DIR)\gtsln$(OBJEXT) \ - $(OBJ_DIR)\kbsln$(OBJEXT) \ - $(OBJ_DIR)\mousesln$(OBJEXT) \ + $(OBJ_DIR)\gtsln$(OBJEXT) \ + $(OBJ_DIR)\kbsln$(OBJEXT) \ + $(OBJ_DIR)\mousesln$(OBJEXT) \ #********************************************************** GTXWC_LIB_OBJS = \ - $(OBJ_DIR)\gtxwc$(OBJEXT) \ + $(OBJ_DIR)\gtxwc$(OBJEXT) \ #********************************************************** #********************************************************** #********************************************************** HARBOUR_EXE_OBJS = \ - $(OBJ_DIR)\harbour$(OBJEXT) \ + $(OBJ_DIR)\harbour$(OBJEXT) \ #********************************************************** HBPP_EXE_OBJS = \ - $(OBJ_DIR)\hbpp$(OBJEXT) \ - $(OBJ_DIR)\hbpptbl$(OBJEXT) \ - $(OBJ_DIR)\hbppcomp$(OBJEXT) \ - $(OBJ_DIR)\hbppcore$(OBJEXT) \ - $(OBJ_DIR)\pragma$(OBJEXT) \ + $(OBJ_DIR)\hbpp$(OBJEXT) \ + $(OBJ_DIR)\hbpptbl$(OBJEXT) \ + $(OBJ_DIR)\hbppcomp$(OBJEXT) \ + $(OBJ_DIR)\hbppcore$(OBJEXT) \ + $(OBJ_DIR)\pragma$(OBJEXT) \ # $(OBJ_DIR)\hbpplib$(OBJEXT) \ #********************************************************** HBPPGEN_EXE_OBJS = \ - $(OBJ_DIR)\hbppgen$(OBJEXT) \ + $(OBJ_DIR)\hbppgen$(OBJEXT) \ #********************************************************** HBPPTEST_EXE_OBJS = \ - $(OBJ_DIR)\pretest$(OBJEXT) \ + $(OBJ_DIR)\pretest$(OBJEXT) \ #********************************************************** HBRUN_EXE_OBJS = \ - $(OBJ_DIR)\hbrun$(OBJEXT) \ - $(OBJ_DIR)\external$(OBJEXT) \ + $(OBJ_DIR)\hbrun$(OBJEXT) \ + $(OBJ_DIR)\external$(OBJEXT) \ #********************************************************** HBDOT_EXE_OBJS = \ - $(OBJ_DIR)\hbdot$(OBJEXT) \ + $(OBJ_DIR)\hbdot$(OBJEXT) \ #********************************************************** HBTEST_EXE_OBJS = \ - $(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) \ + $(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$(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)\teeasc$(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) \ + $(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)\teeasc$(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$(OBJEXT) \ - $(OBJ_DIR)\genpdf1$(OBJEXT) \ + $(HBDOC_EXE_OBJS) \ + $(OBJ_DIR)\pdfhbdoc$(OBJEXT) \ + $(OBJ_DIR)\genpdf1$(OBJEXT) \ !endif #********************************************************** HBMAKE_EXE_OBJS = \ - $(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) \ - $(OBJ_DIR)\readline$(OBJEXT) \ - $(OBJ_DIR)\tmake$(OBJEXT) \ + $(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) \ + $(OBJ_DIR)\readline$(OBJEXT) \ + $(OBJ_DIR)\tmake$(OBJEXT) \ #********************************************************** HBVER_EXE_OBJS = \ - $(OBJ_DIR)\hbverfix$(OBJEXT) \ + $(OBJ_DIR)\hbverfix$(OBJEXT) \ #********************************************************** #********************************************************** @@ -1068,32 +1066,32 @@ HBVER_EXE_OBJS = \ # They have wrong OBJ directory. We fix it # in each respective makefile. TMP_DLL_OBJS = \ - $(COMMON_LIB_OBJS) \ - $(PP_LIB_OBJS) \ - $(VM_DLL_OBJS) \ - $(RTL_LIB_OBJS) \ - $(MACRO_LIB_OBJS) \ - $(DEBUG_LIB_OBJS) \ - $(LANG_LIB_OBJS) \ - $(CODEPAGE_LIB_OBJS) \ - $(PCRE_LIB_OBJS) \ - $(RDD_LIB_OBJS) \ - $(DBFNTX_LIB_OBJS) \ - $(DBFCDX_LIB_OBJS) \ - $(DBFFPT_LIB_OBJS) \ - $(HBSIX_LIB_OBJS) \ - $(HSX_LIB_OBJS) \ - $(USRRDD_LIB_OBJS) \ - $(GTCGI_LIB_OBJS) \ - $(GTPCA_LIB_OBJS) \ - $(GTSTD_LIB_OBJS) \ - $(GTWIN_LIB_OBJS) \ - $(GTWVT_LIB_OBJS) \ - $(GTGUI_DLL_OBJS) \ + $(COMMON_LIB_OBJS) \ + $(PP_LIB_OBJS) \ + $(VM_DLL_OBJS) \ + $(RTL_LIB_OBJS) \ + $(MACRO_LIB_OBJS) \ + $(DEBUG_LIB_OBJS) \ + $(LANG_LIB_OBJS) \ + $(CODEPAGE_LIB_OBJS) \ + $(PCRE_LIB_OBJS) \ + $(RDD_LIB_OBJS) \ + $(DBFNTX_LIB_OBJS) \ + $(DBFCDX_LIB_OBJS) \ + $(DBFFPT_LIB_OBJS) \ + $(HBSIX_LIB_OBJS) \ + $(HSX_LIB_OBJS) \ + $(USRRDD_LIB_OBJS) \ + $(GTCGI_LIB_OBJS) \ + $(GTPCA_LIB_OBJS) \ + $(GTSTD_LIB_OBJS) \ + $(GTWIN_LIB_OBJS) \ + $(GTWVT_LIB_OBJS) \ + $(GTGUI_DLL_OBJS) \ -DISABLED_SHARED_MODULES= \ - $(NULSYS_LIB_OBJS) \ - $(GTDOS_LIB_OBJS) \ +DISABLED_SHARED_MODULES= \ + $(NULSYS_LIB_OBJS) \ + $(GTDOS_LIB_OBJS) \ #********************************************************** #********************************************************** @@ -1104,38 +1102,38 @@ DISABLED_SHARED_MODULES= \ # HB_BUILD_TARGETS = \ - $(COMMON_LIB) \ - $(HBPPGEN_EXE) \ - $(PP_LIB) \ - \ - $(COMPILER_LIB) \ - $(HARBOUR_EXE) \ - $(HBPP_EXE) \ - \ - $(VM_LIB) \ - $(RTL_LIB) \ - $(MACRO_LIB) \ - $(DEBUG_LIB) \ - $(LANG_LIB) \ - $(CODEPAGE_LIB) \ - $(PCRE_LIB) \ - $(RDD_LIB) \ - $(NULSYS_LIB) \ - $(DBFNTX_LIB) \ - $(DBFCDX_LIB) \ - $(DBFFPT_LIB) \ - $(HBSIX_LIB) \ - $(HSX_LIB) \ - $(USRRDD_LIB) \ - $(HB_GT_LIBS) \ - \ - $(HBRUN_EXE) \ - $(HBDOT_EXE) \ - $(HBTEST_EXE) \ - $(HBPPTEST_EXE) \ - $(HBDOC_EXE) \ - $(HBMAKE_EXE) \ - $(HBVER_EXE) \ + $(COMMON_LIB) \ + $(HBPPGEN_EXE) \ + $(PP_LIB) \ + \ + $(COMPILER_LIB) \ + $(HARBOUR_EXE) \ + $(HBPP_EXE) \ + \ + $(VM_LIB) \ + $(RTL_LIB) \ + $(MACRO_LIB) \ + $(DEBUG_LIB) \ + $(LANG_LIB) \ + $(CODEPAGE_LIB) \ + $(PCRE_LIB) \ + $(RDD_LIB) \ + $(NULSYS_LIB) \ + $(DBFNTX_LIB) \ + $(DBFCDX_LIB) \ + $(DBFFPT_LIB) \ + $(HBSIX_LIB) \ + $(HSX_LIB) \ + $(USRRDD_LIB) \ + $(HB_GT_LIBS) \ + \ + $(HBRUN_EXE) \ + $(HBDOT_EXE) \ + $(HBTEST_EXE) \ + $(HBPPTEST_EXE) \ + $(HBDOC_EXE) \ + $(HBMAKE_EXE) \ + $(HBVER_EXE) \ # DLL Target is disabled by default # It can be enabled by setting env diff --git a/harbour/contrib/apollo/make_b32.bat b/harbour/contrib/apollo/make_b32.bat index 4265850ca9..a1db878817 100644 --- a/harbour/contrib/apollo/make_b32.bat +++ b/harbour/contrib/apollo/make_b32.bat @@ -3,8 +3,16 @@ rem rem $Id$ rem -if "%APOLLO_DIR%" == "" goto HELP +if NOT "%APOLLO_DIR%" == "" goto EXEC +echo APOLLO_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need Apollo headers and lib and this envvar +echo to be set to successfully build this library: +echo set APOLLO_DIR=C:\Apollo +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%APOLLO_DIR%\include set HB_DLL_NAME=sde61 if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%APOLLO_DIR% @@ -43,12 +51,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need Apollo headers and lib and this envvar -echo to be set to successfully build this library: -echo set APOLLO_DIR=C:\Apollo -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/apollo/make_vc.bat b/harbour/contrib/apollo/make_vc.bat index d67b369da3..8b81e3c319 100644 --- a/harbour/contrib/apollo/make_vc.bat +++ b/harbour/contrib/apollo/make_vc.bat @@ -3,8 +3,16 @@ rem rem $Id$ rem -if "%APOLLO_DIR%" == "" goto HELP +if NOT "%APOLLO_DIR%" == "" goto EXEC +echo APOLLO_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need Apollo headers and lib and this envvar +echo to be set to successfully build this library: +echo set APOLLO_DIR=C:\Apollo +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%APOLLO_DIR%\include set HB_DLL_NAME=sde61 if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%APOLLO_DIR% @@ -59,12 +67,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need Apollo headers and lib and this envvar -echo to be set to successfully build this library: -echo set APOLLO_DIR=C:\Apollo -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/firebird/make_b32.bat b/harbour/contrib/firebird/make_b32.bat index 42869d50f4..85cae6b2b8 100644 --- a/harbour/contrib/firebird/make_b32.bat +++ b/harbour/contrib/firebird/make_b32.bat @@ -3,8 +3,16 @@ rem rem $Id$ rem -if "%FIREBIRD_DIR%" == "" goto HELP +if NOT "%FIREBIRD_DIR%" == "" goto EXEC +echo FIREBIRD_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need Firebird package and this envvar +echo to be set to successfully build this library: +echo set FIREBIRD_DIR=C:\Firebird +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED set HB_DLL_NAME=fbclient if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%FIREBIRD_DIR%\bin @@ -43,12 +51,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need Firebird package and this envvar -echo to be set to successfully build this library: -echo set FIREBIRD_DIR=C:\Firebird -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/firebird/make_vc.bat b/harbour/contrib/firebird/make_vc.bat index 89742aeaa2..c2b943b154 100644 --- a/harbour/contrib/firebird/make_vc.bat +++ b/harbour/contrib/firebird/make_vc.bat @@ -3,8 +3,16 @@ rem rem $Id$ rem -if "%FIREBIRD_DIR%" == "" goto HELP +if NOT "%FIREBIRD_DIR%" == "" goto EXEC +echo FIREBIRD_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need Firebird package and this envvar +echo to be set to successfully build this library: +echo set FIREBIRD_DIR=C:\Firebird +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED set HB_DLL_NAME=fbclient if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%FIREBIRD_DIR%\bin @@ -59,12 +67,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need Firebird package and this envvar -echo to be set to successfully build this library: -echo set FIREBIRD_DIR=C:\Firebird -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/freeimage/make_b32.bat b/harbour/contrib/freeimage/make_b32.bat index ec0b4e0d47..5e040ab0f9 100644 --- a/harbour/contrib/freeimage/make_b32.bat +++ b/harbour/contrib/freeimage/make_b32.bat @@ -3,8 +3,17 @@ rem rem $Id$ rem -if "%FREEIMAGE_DIR%" == "" goto HELP +if NOT "%FREEIMAGE_DIR%" == "" goto EXEC +echo FREEIMAGE_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need Freeimage headers and binary from here: +echo http://freeimage.sourceforge.net/download.html +echo and this envvar to be set to successfully build this library: +echo set FREEIMAGE_DIR=C:\FreeImage +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED set HB_DLL_NAME=FreeImage if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist @@ -43,13 +52,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need Freeimage headers and binary from here: -echo http://freeimage.sourceforge.net/download.html -echo and this envvar to be set to successfully build this library: -echo set FREEIMAGE_DIR=C:\FreeImage -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/freeimage/make_vc.bat b/harbour/contrib/freeimage/make_vc.bat index 530dce7c44..7721600f29 100644 --- a/harbour/contrib/freeimage/make_vc.bat +++ b/harbour/contrib/freeimage/make_vc.bat @@ -3,8 +3,17 @@ rem rem $Id$ rem -if "%FREEIMAGE_DIR%" == "" goto HELP +if NOT "%FREEIMAGE_DIR%" == "" goto EXEC +echo FREEIMAGE_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need Freeimage headers and binary from here: +echo http://freeimage.sourceforge.net/download.html +echo and this envvar to be set to successfully build this library: +echo set FREEIMAGE_DIR=C:\FreeImage +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED set HB_DLL_NAME=FreeImage if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist @@ -59,13 +68,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need Freeimage headers and binary from here: -echo http://freeimage.sourceforge.net/download.html -echo and this envvar to be set to successfully build this library: -echo set FREEIMAGE_DIR=C:\FreeImage -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/gd/make_b32.bat b/harbour/contrib/gd/make_b32.bat index 94060253c4..5daa39ed91 100644 --- a/harbour/contrib/gd/make_b32.bat +++ b/harbour/contrib/gd/make_b32.bat @@ -3,8 +3,16 @@ rem rem $Id$ rem -if "%GD_DIR%" == "" goto HELP +if NOT "%GD_DIR%" == "" goto EXEC +echo GD_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need GD lib package from www.libgd.org and this +echo envvar to be set to successfully build this library: +echo set GD_DIR=-IC:\gd +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%GD_DIR%\include set HB_DLL_NAME=bgd if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%GD_DIR%\bin @@ -43,12 +51,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need GD lib package from www.libgd.org and this envvar -echo to be set to successfully build this library: -echo set GD_DIR=-IC:\gd -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/gd/make_vc.bat b/harbour/contrib/gd/make_vc.bat index 0841602781..2fef5b77c9 100644 --- a/harbour/contrib/gd/make_vc.bat +++ b/harbour/contrib/gd/make_vc.bat @@ -3,14 +3,16 @@ rem rem $Id$ rem -if "%GD_DIR%" == "" goto HELP - -rem --------------------------------------------------------------- -rem IMPORTANT: You'll need GD lib package from www.libgd.org and this envvar -rem to be set to successfully build this library: -rem set GD_DIR=-IC:\gd -rem --------------------------------------------------------------- +if NOT "%GD_DIR%" == "" goto EXEC +echo GD_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need GD lib package from www.libgd.org and this +echo envvar to be set to successfully build this library: +echo set GD_DIR=-IC:\gd +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%GD_DIR%\include set HB_DLL_NAME=bgd if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%GD_DIR%\bin @@ -65,12 +67,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need GD lib package from www.libgd.org and this envvar -echo to be set to successfully build this library: -echo set GD_DIR=-IC:\gd -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/make_all.mak b/harbour/contrib/make_all.mak new file mode 100644 index 0000000000..9310af6ce4 --- /dev/null +++ b/harbour/contrib/make_all.mak @@ -0,0 +1,127 @@ +# +# $Id: make_all.mak 7958 2007-11-12 15:10:28Z druzus $ +# + +# Makefile for buildning all buildable contribs. +# It is common for Bcc and Msvc + +#********************************************************** + +!ifndef HB_CC_NAME +!error HB_CC_NAME environment variable not defined +!endif + +#********************************************************** + +!ifndef ECHO +ECHO = echo +!endif +!ifndef DEL +DEL = del +!endif + +#********************************************************** + +SHEET=\ +hbclip\ + +DIRS=\ +adordd\ +bmdbfcdx\ +btree\ +examples\ +hbzlib\ +hgf\ +htmllib\ +libct\ +libgt\ +libmisc\ +libnf\ +msql\ +odbc\ +ole\ +rdd_ads\ +samples\ +telepath\ +tip\ +win32\ +xhb\ + +!if "$(APOLLO_DIR)" != "" +DIRS=$(DIRS) apollo +!endif + +!if "$(DIRECTX_DIR)" != "" +DIRS=$(DIRS) directx +!endif + +!if "$(FIREBIRD_DIR)" != "" +DIRS=$(DIRS) firebird +!endif + +!if "$(GD_DIR)" != "" +DIRS=$(DIRS) gd +!endif + +!if "$(FREEIMAGE_DIR)" != "" +DIRS=$(DIRS) freeimage +!endif + +!if "$(MYSQL_DIR)" != "" +DIRS=$(DIRS) mysql +!endif + +!if "$(PDFLIB_DIR)" != "" +DIRS=$(DIRS) pdflib +!endif + +!if "$(PGSQL_DIR)" != "" +DIRS=$(DIRS) pgsql +!endif + +#********************************************************** + +all : prebuild exec + +prebuild : + @echo @set HB_BUILD_TARGET=all > mk_trg.bat + +#********************************************************** + +clean : preclean exec +Clean : preclean exec +CLEAN : preclean exec + +preclean : + @echo @set HB_BUILD_TARGET=clean > mk_trg.bat + +#********************************************************** + +install : preinstall exec +Install : preinstall exec +INSTALL : preinstall exec + +preinstall : + @echo @set HB_BUILD_TARGET=install > mk_trg.bat + +#********************************************************** + +exec : + @$(ECHO) @echo off > mk_one.bat + @$(ECHO) if """%%1""" == """""" goto skip >> mk_one.bat + @$(ECHO) echo Entering %%1 directory >> mk_one.bat + @$(ECHO) rem set HB_SHOW_ERRORS=no >> mk_one.bat + @$(ECHO) cd %%1 >> mk_one.bat + @$(ECHO) call ..\mk_trg.bat >> mk_one.bat + @$(ECHO) if exist make_$(HB_CC_NAME).bat call make_$(HB_CC_NAME).bat %%%HB_BUILD_TARGET%%% >> mk_one.bat + @$(ECHO) cd .. >> mk_one.bat + @$(ECHO) :skip >> mk_one.bat + @< nul + @if exist mk_one.bat $(DEL) mk_one.bat > nul + @if exist mk_trg.bat $(DEL) mk_trg.bat > nul + +#********************************************************** diff --git a/harbour/contrib/make_b32.bat b/harbour/contrib/make_b32.bat deleted file mode 100644 index 387e3d8c16..0000000000 --- a/harbour/contrib/make_b32.bat +++ /dev/null @@ -1,21 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "" goto ERROR - -set ECHO=echo -cd %1 -call make_b32.bat %2 %3 %4 %5 %6 %7 %8 %9 -cd .. -set ECHO= - -goto EXIT - -:ERROR -echo ---------------------------------------- -echo RUN : make_b32.bat DIRNAME !!! -echo ---------------------------------------- - -:EXIT diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index c34924ba7c..008224dff2 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -3,9 +3,12 @@ rem rem $Id$ rem -set HB_SHOW_ERRORS=no +rem --------------------------------------------------------------- -set DO_NOT_COMPILE=examples hbclip hgf msql -set DIRS=adordd bmdbfcdx btree libct libgt libmisc libnf ole pdflib samples tip win32 xhb firebird freeimage gd apollo directx hbzlib htmllib mysql odbc pgsql rdd_ads telepath +if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32 +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe +if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=no -FOR %%n IN ( %DIRS% ) DO call make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +rem --------------------------------------------------------------- + +%HB_MAKE_PROGRAM% -N -r -f make_all.mak %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/make_vc.bat b/harbour/contrib/make_vc.bat deleted file mode 100644 index f6795089dd..0000000000 --- a/harbour/contrib/make_vc.bat +++ /dev/null @@ -1,19 +0,0 @@ -@echo off -rem -rem $Id$ -rem - -if "%1" == "" goto ERROR - -cd %1 -call make_vc.bat %2 %3 %4 %5 %6 %7 %8 %9 -cd .. - -goto EXIT - -:ERROR -echo ---------------------------------------- -echo RUN : make_vc.bat DIRNAME !!! -echo ---------------------------------------- - -:EXIT diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index 936c048c29..cde5a0b4c4 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -3,9 +3,14 @@ rem rem $Id$ rem -set HB_SHOW_ERRORS=no +rem --------------------------------------------------------------- -set DO_NOT_COMPILE=examples hbclip hgf msql -set DIRS=adordd bmdbfcdx btree libct libgt libmisc libnf ole pdflib samples tip win32 xhb firebird freeimage gd apollo directx hbzlib htmllib mysql odbc pgsql rdd_ads telepath +if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc +if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe +if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=no -FOR %%n IN ( %DIRS% ) DO call make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 +set HB_MAKE_FLAGS=/NOLOGO /S /C %HB_MAKE_FLAGS% + +rem --------------------------------------------------------------- + +%HB_MAKE_PROGRAM% /f make_all.mak %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/mtpl_b32.bat b/harbour/contrib/mtpl_b32.bat index 8b1e5e216a..1b37b7b1ce 100644 --- a/harbour/contrib/mtpl_b32.bat +++ b/harbour/contrib/mtpl_b32.bat @@ -18,7 +18,7 @@ rem --------------------------------------------------------------- if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32 if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=yes -if "%HB_MAKEFILE%" == "" set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- @@ -36,21 +36,25 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -N -r -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log + if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT :CLEAN - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -N -r -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul goto EXIT :INSTALL - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -N -r -f %HB_MAKEFILE% INSTALL > nul + if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT goto EXIT @@ -60,3 +64,5 @@ rem --------------------------------------------------------------- rem Restore user value set COPYCMD=%HB_ORGENV_COPYCMD% + +if "%HB_EXIT_LEVEL%" == "1" exit 1 diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index d7a83c8203..9929a520c0 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -2,6 +2,7 @@ # $Id$ # +# -------------------------------------------------------- # Makefile common section for Harbour Project Contrib libs # for Borland C/C++ # -------------------------------------------------------- @@ -28,7 +29,7 @@ HB_ROOT = ..\.. !endif -!include $(HB_ROOT)\contrib\mtpl.mak +!include $(HB_ROOT)\contrib\mtpl_defs.mak #********************************************************** # C compiler definition and C flags. These should never have to change. @@ -65,10 +66,12 @@ $(OBJ_DIR);\ #********************************************************** # General *.c --> *.obj COMPILE rule for STATIC Libraries {$(ALL_LIB_SRC_DIRS)}.c{$(OBJ_DIR)}$(OBJEXT): + echo $(CC) $(CLIBFLAGS) -o$@ $< $(CC) $(CLIBFLAGS) -o$@ $< #********************************************************** # General *.cpp --> *.obj COMPILE rule for STATIC Libraries {$(ALL_LIB_SRC_DIRS)}.cpp{$(OBJ_DIR)}$(OBJEXT): + echo $(CC) $(CLIBFLAGS) -o$@ $< $(CC) $(CLIBFLAGS) -o$@ $< #********************************************************** # General *.prg --> *.obj COMPILE rule for STATIC Libraries @@ -96,41 +99,4 @@ $(LIB_PATH) : $(LIB_OBJS) ! #********************************************************** -#********************************************************** -# CLEAN rule(s) -#********************************************************** - -clean: doClean -CLEAN: doClean - -doClean: - $(ECHO) echo off > delone.bat - $(ECHO) if "%1"x == "x" goto skip >> delone.bat - $(ECHO) if exist %1.c $(DEL) %1.c >> delone.bat - $(ECHO) if exist %1.obj $(DEL) %1.obj >> delone.bat - $(ECHO) :skip >> delone.bat - type &&! -call delone.bat $(LIB_OBJS:.obj=^ -call delone.bat ) -! > alldel.bat - $(ECHO) @echo off > delall.bat - type alldel.bat >> delall.bat - delall.bat - if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul - $(DEL) alldel.bat > nul - $(DEL) delone.bat > nul - $(DEL) delall.bat > nul - -#********************************************************** - -#********************************************************** -# INSTALL rule(s) -#********************************************************** - -install: doInstall -INSTALL: doInstall - -doInstall: - if exist $(LIB_DIR)\$(LIBNAME)$(LIBEXT) copy $(LIB_DIR)\$(LIBNAME)$(LIBEXT) $(HB_LIB_INSTALL) > nul - if exist *.api copy *.api $(HB_INC_INSTALL) > nul - if exist *.ch copy *.ch $(HB_INC_INSTALL) > nul +!include $(HB_ROOT)\contrib\mtpl_ruls.mak diff --git a/harbour/contrib/mtpl.mak b/harbour/contrib/mtpl_defs.mak similarity index 83% rename from harbour/contrib/mtpl.mak rename to harbour/contrib/mtpl_defs.mak index eaa8c515d7..142a7ba1f4 100644 --- a/harbour/contrib/mtpl.mak +++ b/harbour/contrib/mtpl_defs.mak @@ -1,68 +1,68 @@ -# -# $Id$ -# - -# Makefile common section for Harbour Project Contrib libs -# for Microsoft Visual C/Borland C/C++ -# ----------------------------------------------------------------- - -#********************************************************** - -# NOTE: "echo." intentionally used instead of "echo", to avoid conflicts -# with external commands named echo. - -!ifndef ECHO -ECHO = echo. -!endif -!ifndef DEL -DEL = del -!endif - -#********************************************************** -# binary file suffixes and prefixes -#********************************************************** - -!ifndef OBJEXT -OBJEXT = .obj -!endif -!ifndef LIBEXT -LIBEXT = .lib -!endif - -.SUFFIXES: $(LIBEXT) $(OBJEXT) .prg .c .cpp .asm - -#********************************************************** -# Install directory defaults. -#********************************************************** - -!ifndef HB_INSTALL_PREFIX -HB_INSTALL_PREFIX = $(HB_ROOT) -!endif - -!ifndef HB_BIN_INSTALL -HB_BIN_INSTALL = $(HB_INSTALL_PREFIX)\bin -!endif -!ifndef HB_INC_INSTALL -HB_INC_INSTALL = $(HB_INSTALL_PREFIX)\include -!endif -!ifndef HB_LIB_INSTALL -HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib -!endif - -#********************************************************** -# Directory macros. These should never have to change. -#********************************************************** - -OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_NAME) -LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_NAME) -BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_NAME) - -INCLUDE_DIR = $(HB_ROOT)\include - -#********************************************************** -# Macros to access Harbour executable and other goodies -#********************************************************** - -HARBOUR_EXE = $(BIN_DIR)\harbour.exe - -#********************************************************** +# +# $Id: mtpl_defs.mak 7958 2007-11-12 15:10:28Z druzus $ +# + +# -------------------------------------------------------- +# Makefile common section for Harbour Project Contrib libs +# for Microsoft Visual C/Borland C/C++ - definitions +# ----------------------------------------------------------------- + +#********************************************************** + +!ifndef ECHO +ECHO = echo +!endif +!ifndef DEL +DEL = del +!endif + +#********************************************************** +# binary file suffixes and prefixes +#********************************************************** + +!ifndef OBJEXT +OBJEXT = .obj +!endif +!ifndef LIBEXT +LIBEXT = .lib +!endif + +#********************************************************** + +.SUFFIXES: $(LIBEXT) $(OBJEXT) .prg .c .cpp .asm + +#********************************************************** +# Install directory defaults. +#********************************************************** + +!ifndef HB_INSTALL_PREFIX +HB_INSTALL_PREFIX = $(HB_ROOT) +!endif + +!ifndef HB_BIN_INSTALL +HB_BIN_INSTALL = $(HB_INSTALL_PREFIX)\bin +!endif +!ifndef HB_INC_INSTALL +HB_INC_INSTALL = $(HB_INSTALL_PREFIX)\include +!endif +!ifndef HB_LIB_INSTALL +HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib +!endif + +#********************************************************** +# Directory macros. These should never have to change. +#********************************************************** + +OBJ_DIR = $(HB_ROOT)\obj\$(HB_CC_NAME) +LIB_DIR = $(HB_ROOT)\lib\$(HB_CC_NAME) +BIN_DIR = $(HB_ROOT)\bin\$(HB_CC_NAME) + +INCLUDE_DIR = $(HB_ROOT)\include + +#********************************************************** +# Macros to access Harbour executable and other goodies +#********************************************************** + +HARBOUR_EXE = $(BIN_DIR)\harbour.exe + +#********************************************************** diff --git a/harbour/contrib/mtpl_ruls.mak b/harbour/contrib/mtpl_ruls.mak new file mode 100644 index 0000000000..d9028fa2ea --- /dev/null +++ b/harbour/contrib/mtpl_ruls.mak @@ -0,0 +1,74 @@ +# +# $Id: mtpl_ruls.mak 7958 2007-11-12 15:10:28Z druzus $ +# + +# -------------------------------------------------------- +# Makefile common section for Harbour Project Contrib libs +# for Microsoft Visual C/Borland C/C++ - common rules +# ----------------------------------------------------------------- + +ALL_HEADERS = $(PRG_HEADERS) $(C_HEADERS) + +#********************************************************** +# CLEAN rule(s) +#********************************************************** + +clean: doClean +Clean: doClean +CLEAN: doClean + +doClean: + @if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul + @$(ECHO) @echo off > delone.bat + @$(ECHO) if """%%1""" == """""" goto skip >> delone.bat + @$(ECHO) if exist %%1.c $(DEL) %%1.c >> delone.bat + @$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> delone.bat + @$(ECHO) :skip >> delone.bat + @< nul + @if exist delone.bat $(DEL) delone.bat > nul + @if exist delall.bat $(DEL) delall.bat > nul + +!if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" + @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul + @$(ECHO) @echo off > delone.bat + @$(ECHO) if """%%1""" == """""" goto skip >> delone.bat + @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> delone.bat + @$(ECHO) :skip >> delone.bat + @< nul + @if exist delone.bat $(DEL) delone.bat > nul + @if exist delall.bat $(DEL) delall.bat > nul +!endif + +#********************************************************** + +#********************************************************** +# INSTALL rule(s) +#********************************************************** + +install: doInstall +Install: doInstall +INSTALL: doInstall + +doInstall: + @if exist $(LIB_PATH) copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul + @$(ECHO) @echo off > cpyone.bat + @$(ECHO) if """%%1""" == """""" goto skip >> cpyone.bat + @$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> cpyone.bat + @$(ECHO) :skip >> cpyone.bat + @< nul + @if exist cpyone.bat $(DEL) cpyone.bat > nul + @if exist cpyall.bat $(DEL) cpyall.bat > nul + +#********************************************************** diff --git a/harbour/contrib/mtpl_vc.bat b/harbour/contrib/mtpl_vc.bat index 6c4240ee2f..9726764a17 100644 --- a/harbour/contrib/mtpl_vc.bat +++ b/harbour/contrib/mtpl_vc.bat @@ -18,7 +18,7 @@ rem --------------------------------------------------------------- if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=yes -if "%HB_MAKEFILE%" == "" set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak +set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak rem --------------------------------------------------------------- @@ -38,12 +38,15 @@ if "%1" == "INSTALL" goto INSTALL %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log + if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT :CLEAN %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log + if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT + if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul goto EXIT @@ -51,6 +54,7 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul + if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT goto EXIT @@ -60,3 +64,5 @@ rem --------------------------------------------------------------- rem Restore user value set COPYCMD=%HB_ORGENV_COPYCMD% + +if "%HB_EXIT_LEVEL%" == "1" exit 1 diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 599ac8f0ab..75ed380ce4 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -2,6 +2,7 @@ # $Id$ # +# -------------------------------------------------------- # Makefile common section for Harbour Project Contrib libs # for Microsoft Visual C # -------------------------------------------------------- @@ -29,7 +30,7 @@ HB_VISUALC_VER = 60 HB_ROOT = ..\.. !endif -!include $(HB_ROOT)\contrib\mtpl.mak +!include $(HB_ROOT)\contrib\mtpl_defs.mak #********************************************************** # C compiler definition and C flags. These should never have to change. @@ -83,42 +84,4 @@ $** <<$(KEEPSTATE) #********************************************************** -#********************************************************** -# CLEAN rule(s) -#********************************************************** - -clean: doClean -CLEAN: doClean - -doClean: - $(ECHO) echo off > delone.bat - $(ECHO) if "%1" == "" goto skip >> delone.bat - $(ECHO) if exist %1.c $(DEL) %1.c >> delone.bat - $(ECHO) if exist %1.obj $(DEL) %1.obj >> delone.bat - $(ECHO) :skip >> delone.bat - type < delall.bat - type alldel.bat >> delall.bat - delall.bat - if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul - if exist $(LIB_PATH) $(DEL) $(LIB_PATH:.lib=.exp) > nul - $(DEL) alldel.bat > nul - $(DEL) delone.bat > nul - $(DEL) delall.bat > nul - -#********************************************************** - -#********************************************************** -# INSTALL rule(s) -#********************************************************** - -install: doInstall -INSTALL: doInstall - -doInstall: - if exist $(LIB_DIR)\$(LIBNAME)$(LIBEXT) copy $(LIB_DIR)\$(LIBNAME)$(LIBEXT) $(HB_LIB_INSTALL) > nul - if exist *.api copy *.api $(HB_INC_INSTALL) > nul - if exist *.ch copy *.ch $(HB_INC_INSTALL) > nul +!include $(HB_ROOT)\contrib\mtpl_ruls.mak diff --git a/harbour/contrib/mysql/make_b32.bat b/harbour/contrib/mysql/make_b32.bat index ab20efa038..335c946a2e 100644 --- a/harbour/contrib/mysql/make_b32.bat +++ b/harbour/contrib/mysql/make_b32.bat @@ -3,8 +3,16 @@ rem rem $Id$ rem -if "%MYSQL_DIR%" == "" goto HELP +if NOT "%MYSQL_DIR%" == "" goto EXEC +echo MYSQL_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need MySQL package and this envvar +echo to be set to successfully build this library: +echo set MYSQL_DIR=C:\mysql +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED set HB_DLL_NAME=libmySQL if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%MYSQL_DIR%\bin @@ -43,12 +51,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need MySQL package and this envvar -echo to be set to successfully build this library: -echo set MYSQL_DIR=C:\mysql -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/mysql/make_vc.bat b/harbour/contrib/mysql/make_vc.bat index 5867e0878b..0959ff04ce 100644 --- a/harbour/contrib/mysql/make_vc.bat +++ b/harbour/contrib/mysql/make_vc.bat @@ -3,8 +3,16 @@ rem rem $Id$ rem -if "%MYSQL_DIR%" == "" goto HELP +if NOT "%MYSQL_DIR%" == "" goto EXEC +echo MYSQL_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need MySQL package and this envvar +echo to be set to successfully build this library: +echo set MYSQL_DIR=C:\mysql +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED set HB_DLL_NAME=libmySQL if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%MYSQL_DIR%\bin @@ -59,12 +67,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need MySQL package and this envvar -echo to be set to successfully build this library: -echo set MYSQL_DIR=C:\mysql -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/pdflib/make_b32.bat b/harbour/contrib/pdflib/make_b32.bat index eb696d6718..057fe00e81 100644 --- a/harbour/contrib/pdflib/make_b32.bat +++ b/harbour/contrib/pdflib/make_b32.bat @@ -3,20 +3,20 @@ rem rem $Id$ rem -if "%PDFLIB_DIR%" == "" goto HELP +if NOT "%PDFLIB_DIR%" == "" goto EXEC +echo PDFLIB_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need PDFLIB sources and this envvar +echo to be set to successfully build this library: +echo set PDFLIB_DIR=C:\pdflib +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 goto EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need PDFLIB sources and this envvar -echo to be set to successfully build this library: -echo set PDFLIB_DIR=C:\pdflib -echo --------------------------------------------------------------- - :EXIT diff --git a/harbour/contrib/pdflib/make_vc.bat b/harbour/contrib/pdflib/make_vc.bat index 0359723d52..251d94b8f5 100644 --- a/harbour/contrib/pdflib/make_vc.bat +++ b/harbour/contrib/pdflib/make_vc.bat @@ -3,20 +3,20 @@ rem rem $Id$ rem -if "%PDFLIB_DIR%" == "" goto HELP +if NOT "%PDFLIB_DIR%" == "" goto EXEC +echo PDFLIB_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need PDFLIB sources and this envvar +echo to be set to successfully build this library: +echo set PDFLIB_DIR=C:\pdflib +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 goto EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need PDFLIB sources and this envvar -echo to be set to successfully build this library: -echo set PDFLIB_DIR=C:\pdflib -echo --------------------------------------------------------------- - :EXIT diff --git a/harbour/contrib/pgsql/make_b32.bat b/harbour/contrib/pgsql/make_b32.bat index 101bb570b8..bd7604ec98 100644 --- a/harbour/contrib/pgsql/make_b32.bat +++ b/harbour/contrib/pgsql/make_b32.bat @@ -3,8 +3,16 @@ rem rem $Id$ rem -if "%PGSQL_DIR%" == "" goto HELP +if NOT "%PGSQL_DIR%" == "" goto EXEC +echo PGSQL_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need PostreSQL package and this envvar +echo to be set to successfully build this library: +echo set PGSQL_DIR=C:\pgsql +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED rem .exe set HB_DLL_NAME=postgres @@ -44,12 +52,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need PostreSQL package and this envvar -echo to be set to successfully build this library: -echo set PGSQL_DIR=C:\pgsql -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/pgsql/make_vc.bat b/harbour/contrib/pgsql/make_vc.bat index 736215ebb5..64e5af7645 100644 --- a/harbour/contrib/pgsql/make_vc.bat +++ b/harbour/contrib/pgsql/make_vc.bat @@ -3,8 +3,16 @@ rem rem $Id$ rem -if "%PGSQL_DIR%" == "" goto HELP +if NOT "%PGSQL_DIR%" == "" goto EXEC +echo PGSQL_DIR environment variable has to be defined ! +echo --------------------------------------------------------------- +echo IMPORTANT: You'll need PostreSQL package and this envvar +echo to be set to successfully build this library: +echo set PGSQL_DIR=C:\pgsql +echo --------------------------------------------------------------- +exit 1 +:EXEC set C_USR=%C_USR% -I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED rem .exe set HB_DLL_NAME=postgres @@ -60,12 +68,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need PostreSQL package and this envvar -echo to be set to successfully build this library: -echo set PGSQL_DIR=C:\pgsql -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/rdd_ads/make_b32.bat b/harbour/contrib/rdd_ads/make_b32.bat index 2f772d84b8..7e0ea91f65 100644 --- a/harbour/contrib/rdd_ads/make_b32.bat +++ b/harbour/contrib/rdd_ads/make_b32.bat @@ -3,18 +3,12 @@ rem rem $Id$ rem -if "%ADS_DIR%" == "" goto HELP +rem --------------------------------------------------------------- +rem IMPORTANT: You'll need Advantage Client Engine installed. +rem --------------------------------------------------------------- -set C_USR=%C_USR% -I%ADS_DIR% set HB_DLL_NAME=ace32 -if not "%HB_DLL_DIR%" == "" goto DIR_OK -if exist "%ADS_DIR%\32bit\ace32.dll" set HB_DLL_DIR=%ADS_DIR%\32bit -if exist "%ADS_DIR%\Redistribute\ace32.dll" set HB_DLL_DIR=%ADS_DIR%\Redistribute -if exist "%ADS_DIR%\ace32.dll" set HB_DLL_DIR=%ADS_DIR% - -:DIR_OK - -echo Using this .dll: %HB_DLL_DIR%\%HB_DLL_NAME%.dll +if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%SystemRoot%\system32 rem --------------------------------------------------------------- @@ -50,13 +44,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need Advantage Client Engine installed and -echo these envvars set to successfully build this library: -echo set ACE_DIR=C:\ads\acesdk -echo set ACE_VER=810 -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/contrib/rdd_ads/make_vc.bat b/harbour/contrib/rdd_ads/make_vc.bat index 348e7645c2..10b64d5df8 100644 --- a/harbour/contrib/rdd_ads/make_vc.bat +++ b/harbour/contrib/rdd_ads/make_vc.bat @@ -3,18 +3,12 @@ rem rem $Id$ rem -if "%ADS_DIR%" == "" goto HELP +rem --------------------------------------------------------------- +rem IMPORTANT: You'll need Advantage Client Engine installed. +rem --------------------------------------------------------------- -set C_USR=%C_USR% -I%ADS_DIR% set HB_DLL_NAME=ace32 -if not "%HB_DLL_DIR%" == "" goto DIR_OK -if exist "%ADS_DIR%\32bit\ace32.dll" set HB_DLL_DIR=%ADS_DIR%\32bit -if exist "%ADS_DIR%\Redistribute\ace32.dll" set HB_DLL_DIR=%ADS_DIR%\Redistribute -if exist "%ADS_DIR%\ace32.dll" set HB_DLL_DIR=%ADS_DIR% - -:DIR_OK - -echo Using this .dll: %HB_DLL_DIR%\%HB_DLL_NAME%.dll +if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%SystemRoot%\system32 rem --------------------------------------------------------------- @@ -66,13 +60,4 @@ if "%1" == "INSTALL" goto POST_INSTALL if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL% goto POST_EXIT -:HELP - -echo --------------------------------------------------------------- -echo IMPORTANT: You'll need Advantage Client Engine installed and -echo these envvars set to successfully build this library: -echo set ACE_DIR=C:\ads\acesdk -echo set ACE_VER=810 -echo --------------------------------------------------------------- - :POST_EXIT diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index f23731ffbe..1a57cb85be 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -2,9 +2,9 @@ # $Id$ # -# +#********************************************************** # Makefile for Harbour Project for Borland C/C++ 5.x compilers -# +#********************************************************** # --------------------------------------------------------------- # If you need to set additional compiler/linker options use the @@ -14,41 +14,41 @@ # # NOTE: You can use these envvars to configure the make process: -# (note that these are all optional) +# (note that these are all optional) # -# CFLAGS - Extra C compiler options for libraries and for -# executables -# C_USR - Extra C compiler options for libraries and for -# executables (GNU make compatible envvar) -# CLIBFLAGS - Extra C compiler options for the static libraries -# CLIBFLAGSDLL - Extra C compiler options for the shared libraries +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the static libraries +# CLIBFLAGSDLL - Extra C compiler options for the shared libraries # -# LDFLAGS - Extra linker options for the static libraries -# LDFLAGSDLL - Extra linker options for the shared libraries +# LDFLAGS - Extra linker options for the static libraries +# LDFLAGSDLL - Extra linker options for the shared libraries # -# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes -# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries -# PRG_USR - Extra Harbour compiler options -# (GNU make compatible envvar) -# HB_GT_DEFAULT - The default GT driver, Choose between : -# gtstd (default),gtcgi,gtwin,gtwvt -# HB_GT_LIB - To override the default GT driver -# (search for HB_GT_LIBS for a list of values) -# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL -# dll in addition to normal static build -# HB_BUILD_DEBUG - If set to yes causes to compile with debug info -# HB_BUILD_VERBOSE - enables echoing commands being executed -# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by -# bison (you must use bison 2.3 or later) -# BCCDLL_WITH_DYNRT - If set to -tWR causes that harbour-bc.dll -# will use dynamic runtime library (recommended) -# HB_INSTALL_PREFIX - Path to instalation directory into which -# Harbour will be installed when the command -# "make_bc.bat install" is lauched. Defaults -# to current directory +# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes +# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# HB_GT_DEFAULT - The default GT driver, Choose between : +# gtstd (default),gtcgi,gtwin,gtwvt +# HB_GT_LIB - To override the default GT driver +# (search for HB_GT_LIBS for a list of values) +# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL +# dll in addition to normal static build +# HB_BUILD_DEBUG - If set to yes causes to compile with debug info +# HB_BUILD_VERBOSE - enables echoing commands being executed +# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by +# bison (you must use bison 2.3 or later) +# BCCDLL_WITH_DYNRT - If set to -tWR causes that harbour-bc.dll +# will use dynamic runtime library (recommended) +# HB_INSTALL_PREFIX - Path to instalation directory into which +# Harbour will be installed when the command +# "make_bc.bat install" is lauched. Defaults +# to current directory # -# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. -# Note that this will require the pdflib contrib. +# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. +# Note that this will require the pdflib contrib. # --------------------------------------------------------------- # "echo." intentionally used instead of "echo", to avoid conflicts @@ -69,10 +69,10 @@ #********************************************************** !ifndef ECHO - ECHO = echo. + ECHO = echo. !endif !ifndef DEL - DEL = del + DEL = del !endif #********************************************************** @@ -105,12 +105,12 @@ DLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) # allows to do cross-compiling if neccesary. !ifndef HB - HB = $(HARBOUR_EXE) + HB = $(HARBOUR_EXE) !endif # allows to do cross-compiling if neccesary. !ifndef HBPPGEN - HBPPGEN = $(HBPPGEN_EXE) + HBPPGEN = $(HBPPGEN_EXE) !endif #********************************************************** @@ -125,26 +125,26 @@ DLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) INCLUDE_DIR = include # C Compiler Flags -CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -Iobj\$(HB_CC_NAME) +CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -Iobj\$(HB_CC_NAME) #----------- !ifndef BCC_NOOPTIM - CFLAGS = -O2 $(CFLAGS) + CFLAGS = -O2 $(CFLAGS) !endif #----------- !if "$(HB_BUILD_DEBUG)" == "yes" - CFLAGS = -y -v $(CFLAGS) + CFLAGS = -y -v $(CFLAGS) !endif #----------- !if "$(BCCDLL_WITH_DYNRT)" == "-tWR" - RTLIBSUFFIX = i + RTLIBSUFFIX = i !endif #----------- !if "$(HB_GT_DEFAULT)" != "" - CFLAGS = -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=) $(CFLAGS) + CFLAGS = -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=) $(CFLAGS) !endif #----------- !if "$(HB_GT_LIB)" != "" - CFLAGS = -DHB_GT_LIB=$(HB_GT_LIB:gt=) $(CFLAGS) + CFLAGS = -DHB_GT_LIB=$(HB_GT_LIB:gt=) $(CFLAGS) !endif #----------- CLIBFLAGS = -c -q $(CFLAGS) $(CLIBFLAGS) @@ -154,17 +154,17 @@ CEXEFLAGSDLL = -tWM $(BCCDLL_WITH_DYNRT) $(CLIBFLAGS) $(CEXEFLAGSDLL) # Harbour Compiler Flags HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 -kM $(PRG_USR) !ifdef HB_DOC_PDF - HBFLAGSCMN = $(HBFLAGSCMN) -dPDF + HBFLAGSCMN = $(HBFLAGSCMN) -dPDF !endif HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) HARBOURFLAGSDLL= -D__EXPORT__ -n1 -l $(HBFLAGSCMN) $(HARBOURFLAGSDLL) # Linker Flags -LDFLAGS = -ap -Tpe -Gn -C -L$(LIB_DIR) -L$(BIN_DIR) $(LDFLAGS) +LDFLAGS = -ap -Tpe -Gn -C -L$(LIB_DIR) -L$(BIN_DIR) $(LDFLAGS) LDFLAGSDLL = -aa -Gn -C -Tpd -Gi -L$(LIB_DIR) $(LDFLAGSDLL) !if "$(HB_BUILD_DEBUG)" == "yes" - LDFLAGS = -v $(LDFLAGS) - LDFLAGSDLL = -v $(LDFLAGSDLL) + LDFLAGS = -v $(LDFLAGS) + LDFLAGSDLL = -v $(LDFLAGSDLL) !endif #********************************************************** @@ -184,36 +184,36 @@ ARFLAGS = /P32 #********************************************************** # General *.c --> *.obj COMPILE rule for STATIC Libraries {$(ALL_SRC_DIRS)}.c{$(OBJ_DIR)}$(OBJEXT): - $(CC) $(CLIBFLAGS) -o$@ $< + $(CC) $(CLIBFLAGS) -o$@ $< #********************************************************** # General *.prg --> *.obj COMPILE rule for STATIC Libraries {$(ALL_SRC_DIRS)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $** - $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $** + $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c #********************************************************** #********************************************************** # General *.c --> *.obj COMPILE rule for SHARED Libraries {$(ALL_LIB_SRC_DIRS)}.c{$(DLL_OBJ_DIR)}$(OBJEXT): - $(CC) $(CLIBFLAGSDLL) -o$@ $< + $(CC) $(CLIBFLAGSDLL) -o$@ $< #********************************************************** # General *.prg --> *.obj COMPILE rule for SHARED Libraries {$(ALL_LIB_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $** - $(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $** + $(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c #********************************************************** #********************************************************** # General *.c --> *.obj COMPILE rules for EXECUTABLES, # which use Harbour SHARED Library compiled as DLL {$(ALL_EXE_SRC_DIRS)}.c{$(DLL_OBJ_DIR)}$(OBJEXT): - $(CC) $(CEXEFLAGSDLL) -o$@ $< + $(CC) $(CEXEFLAGSDLL) -o$@ $< #********************************************************** # General *.prg --> *.obj COMPILE rules for EXECUTABLES, # which use Harbour SHARED Library compiled as DLL {$(ALL_EXE_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $** - $(CC) $(CEXEFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $** + $(CC) $(CEXEFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c #********************************************************** #********************************************************** @@ -249,187 +249,187 @@ StdLibs : $(STANDARD_STATIC_HBLIBS) #********************************************************** $(HB_DEST_DIRS) $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL): - !if not exist $@\nul mkdir $@ + !if not exist $@\nul mkdir $@ #********************************************************** # LIBRARY Targets BUILD rules #********************************************************** $(COMMON_LIB) : $(COMMON_LIB_OBJS) - IF EXIST "$(COMMON_LIB)" $(DEL) "$(COMMON_LIB)" > NUL - $(MKLIB) "$(COMMON_LIB)" $(ARFLAGS) @&&! + IF EXIST "$(COMMON_LIB)" $(DEL) "$(COMMON_LIB)" > NUL + $(MKLIB) "$(COMMON_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(PP_LIB) : $(PP_LIB_OBJS) - IF EXIST "$(PP_LIB)" $(DEL) "$(PP_LIB)" > NUL - $(MKLIB) "$(PP_LIB)" $(ARFLAGS) @&&! +$(PP_LIB) : $(PP_LIB_OBJS) + IF EXIST "$(PP_LIB)" $(DEL) "$(PP_LIB)" > NUL + $(MKLIB) "$(PP_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** $(COMPILER_LIB) : $(COMPILER_LIB_OBJS) - IF EXIST "$(COMPILER_LIB)" $(DEL) "$(COMPILER_LIB)" > NUL - $(MKLIB) "$(COMPILER_LIB)" $(ARFLAGS) @&&! + IF EXIST "$(COMPILER_LIB)" $(DEL) "$(COMPILER_LIB)" > NUL + $(MKLIB) "$(COMPILER_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(VM_LIB) :: BasicExes -$(VM_LIB) :: $(VM_LIB_OBJS) - IF EXIST "$(VM_LIB)" $(DEL) "$(VM_LIB)" > NUL - $(MKLIB) "$(VM_LIB)" $(ARFLAGS) @&&! +$(VM_LIB) :: BasicExes +$(VM_LIB) :: $(VM_LIB_OBJS) + IF EXIST "$(VM_LIB)" $(DEL) "$(VM_LIB)" > NUL + $(MKLIB) "$(VM_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(RTL_LIB) :: BasicExes -$(RTL_LIB) :: $(RTL_LIB_OBJS) - IF EXIST "$(RTL_LIB)" $(DEL) "$(RTL_LIB)" > NUL - $(MKLIB) "$(RTL_LIB)" $(ARFLAGS) @&&! +$(RTL_LIB) :: BasicExes +$(RTL_LIB) :: $(RTL_LIB_OBJS) + IF EXIST "$(RTL_LIB)" $(DEL) "$(RTL_LIB)" > NUL + $(MKLIB) "$(RTL_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(MACRO_LIB) : $(MACRO_LIB_OBJS) - IF EXIST "$(MACRO_LIB)" $(DEL) "$(MACRO_LIB)" > NUL - $(MKLIB) "$(MACRO_LIB)" $(ARFLAGS) @&&! +$(MACRO_LIB) : $(MACRO_LIB_OBJS) + IF EXIST "$(MACRO_LIB)" $(DEL) "$(MACRO_LIB)" > NUL + $(MKLIB) "$(MACRO_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(DEBUG_LIB) :: BasicExes -$(DEBUG_LIB) :: $(DEBUG_LIB_OBJS) - IF EXIST "$(DEBUG_LIB)" $(DEL) "$(DEBUG_LIB)" > NUL - $(MKLIB) "$(DEBUG_LIB)" $(ARFLAGS) @&&! +$(DEBUG_LIB) :: BasicExes +$(DEBUG_LIB) :: $(DEBUG_LIB_OBJS) + IF EXIST "$(DEBUG_LIB)" $(DEL) "$(DEBUG_LIB)" > NUL + $(MKLIB) "$(DEBUG_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(LANG_LIB) : $(LANG_LIB_OBJS) - IF EXIST "$(LANG_LIB)" $(DEL) "$(LANG_LIB)" > NUL - $(MKLIB) "$(LANG_LIB)" $(ARFLAGS) @&&! +$(LANG_LIB) : $(LANG_LIB_OBJS) + IF EXIST "$(LANG_LIB)" $(DEL) "$(LANG_LIB)" > NUL + $(MKLIB) "$(LANG_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** $(CODEPAGE_LIB) : $(CODEPAGE_LIB_OBJS) - IF EXIST "$(CODEPAGE_LIB)" $(DEL) "$(CODEPAGE_LIB)" > NUL - $(MKLIB) "$(CODEPAGE_LIB)" $(ARFLAGS) @&&! + IF EXIST "$(CODEPAGE_LIB)" $(DEL) "$(CODEPAGE_LIB)" > NUL + $(MKLIB) "$(CODEPAGE_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(PCRE_LIB) : $(PCRE_LIB_OBJS) - IF EXIST "$(PCRE_LIB)" $(DEL) "$(PCRE_LIB)" > NUL - $(MKLIB) "$(PCRE_LIB)" $(ARFLAGS) @&&! +$(PCRE_LIB) : $(PCRE_LIB_OBJS) + IF EXIST "$(PCRE_LIB)" $(DEL) "$(PCRE_LIB)" > NUL + $(MKLIB) "$(PCRE_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(RDD_LIB) :: BasicExes -$(RDD_LIB) :: $(RDD_LIB_OBJS) - IF EXIST "$(RDD_LIB)" $(DEL) "$(RDD_LIB)" > NUL - $(MKLIB) "$(RDD_LIB)" $(ARFLAGS) @&&! +$(RDD_LIB) :: BasicExes +$(RDD_LIB) :: $(RDD_LIB_OBJS) + IF EXIST "$(RDD_LIB)" $(DEL) "$(RDD_LIB)" > NUL + $(MKLIB) "$(RDD_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** $(NULSYS_LIB) : $(NULSYS_LIB_OBJS) - IF EXIST "$(NULSYS_LIB)" $(DEL) "$(NULSYS_LIB)" > NUL - $(MKLIB) "$(NULSYS_LIB)" $(ARFLAGS) @&&! + IF EXIST "$(NULSYS_LIB)" $(DEL) "$(NULSYS_LIB)" > NUL + $(MKLIB) "$(NULSYS_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** $(DBFNTX_LIB) :: BasicExes $(DBFNTX_LIB) :: $(DBFNTX_LIB_OBJS) - IF EXIST "$(DBFNTX_LIB)" $(DEL) "$(DBFNTX_LIB)" > NUL - $(MKLIB) "$(DBFNTX_LIB)" $(ARFLAGS) @&&! + IF EXIST "$(DBFNTX_LIB)" $(DEL) "$(DBFNTX_LIB)" > NUL + $(MKLIB) "$(DBFNTX_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** $(DBFCDX_LIB) : $(DBFCDX_LIB_OBJS) - IF EXIST "$(DBFCDX_LIB)" $(DEL) "$(DBFCDX_LIB)" > NUL - $(MKLIB) "$(DBFCDX_LIB)" $(ARFLAGS) @&&! + IF EXIST "$(DBFCDX_LIB)" $(DEL) "$(DBFCDX_LIB)" > NUL + $(MKLIB) "$(DBFCDX_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** $(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS) - IF EXIST "$(DBFFPT_LIB)" $(DEL) "$(DBFFPT_LIB)" > NUL - $(MKLIB) "$(DBFFPT_LIB)" $(ARFLAGS) @&&! + IF EXIST "$(DBFFPT_LIB)" $(DEL) "$(DBFFPT_LIB)" > NUL + $(MKLIB) "$(DBFFPT_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) - IF EXIST "$(HBSIX_LIB)" $(DEL) "$(HBSIX_LIB)" > NUL - $(MKLIB) "$(HBSIX_LIB)" $(ARFLAGS) @&&! +$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) + IF EXIST "$(HBSIX_LIB)" $(DEL) "$(HBSIX_LIB)" > NUL + $(MKLIB) "$(HBSIX_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(HSX_LIB) : $(HSX_LIB_OBJS) - IF EXIST "$(HSX_LIB)" $(DEL) "$(HSX_LIB)" > NUL - $(MKLIB) "$(HSX_LIB)" $(ARFLAGS) @&&! +$(HSX_LIB) : $(HSX_LIB_OBJS) + IF EXIST "$(HSX_LIB)" $(DEL) "$(HSX_LIB)" > NUL + $(MKLIB) "$(HSX_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** $(USRRDD_LIB) : $(USRRDD_LIB_OBJS) - IF EXIST "$(USRRDD_LIB)" $(DEL) "$(USRRDD_LIB)" > NUL - $(MKLIB) "$(USRRDD_LIB)" $(ARFLAGS) @&&! + IF EXIST "$(USRRDD_LIB)" $(DEL) "$(USRRDD_LIB)" > NUL + $(MKLIB) "$(USRRDD_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(GTCGI_LIB) : $(GTCGI_LIB_OBJS) - IF EXIST "$(GTCGI_LIB)" $(DEL) "$(GTCGI_LIB)" > NUL - $(MKLIB) "$(GTCGI_LIB)" $(ARFLAGS) @&&! +$(GTCGI_LIB) : $(GTCGI_LIB_OBJS) + IF EXIST "$(GTCGI_LIB)" $(DEL) "$(GTCGI_LIB)" > NUL + $(MKLIB) "$(GTCGI_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(GTDOS_LIB) : $(GTDOS_LIB_OBJS) - IF EXIST "$(GTDOS_LIB)" $(DEL) "$(GTDOS_LIB)" > NUL - $(MKLIB) "$(GTDOS_LIB)" $(ARFLAGS) @&&! +$(GTDOS_LIB) : $(GTDOS_LIB_OBJS) + IF EXIST "$(GTDOS_LIB)" $(DEL) "$(GTDOS_LIB)" > NUL + $(MKLIB) "$(GTDOS_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(GTPCA_LIB) : $(GTPCA_LIB_OBJS) - IF EXIST "$(GTPCA_LIB)" $(DEL) "$(GTPCA_LIB)" > NUL - $(MKLIB) "$(GTPCA_LIB)" $(ARFLAGS) @&&! +$(GTPCA_LIB) : $(GTPCA_LIB_OBJS) + IF EXIST "$(GTPCA_LIB)" $(DEL) "$(GTPCA_LIB)" > NUL + $(MKLIB) "$(GTPCA_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(GTSTD_LIB) : $(GTSTD_LIB_OBJS) - IF EXIST "$(GTSTD_LIB)" $(DEL) "$(GTSTD_LIB)" > NUL - $(MKLIB) "$(GTSTD_LIB)" $(ARFLAGS) @&&! +$(GTSTD_LIB) : $(GTSTD_LIB_OBJS) + IF EXIST "$(GTSTD_LIB)" $(DEL) "$(GTSTD_LIB)" > NUL + $(MKLIB) "$(GTSTD_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(GTWIN_LIB) : $(GTWIN_LIB_OBJS) - IF EXIST "$(GTWIN_LIB)" $(DEL) "$(GTWIN_LIB)" > NUL - $(MKLIB) "$(GTWIN_LIB)" $(ARFLAGS) @&&! +$(GTWIN_LIB) : $(GTWIN_LIB_OBJS) + IF EXIST "$(GTWIN_LIB)" $(DEL) "$(GTWIN_LIB)" > NUL + $(MKLIB) "$(GTWIN_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) - IF EXIST "$(GTWVT_LIB)" $(DEL) "$(GTWVT_LIB)" > NUL - $(MKLIB) "$(GTWVT_LIB)" $(ARFLAGS) @&&! +$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) + IF EXIST "$(GTWVT_LIB)" $(DEL) "$(GTWVT_LIB)" > NUL + $(MKLIB) "$(GTWVT_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! #********************************************************** -$(GTGUI_LIB) : $(GTGUI_LIB_OBJS) - IF EXIST "$(GTGUI_LIB)" $(DEL) "$(GTGUI_LIB)" > NUL - $(MKLIB) "$(GTGUI_LIB)" $(ARFLAGS) @&&! +$(GTGUI_LIB) : $(GTGUI_LIB_OBJS) + IF EXIST "$(GTGUI_LIB)" $(DEL) "$(GTGUI_LIB)" > NUL + $(MKLIB) "$(GTGUI_LIB)" $(ARFLAGS) @&&! +$(**: = &^ +) ! @@ -444,8 +444,8 @@ $(GTGUI_LIB) : $(GTGUI_LIB_OBJS) #********************************************************** $(HARBOUR_EXE) :: BasicLibs $(HARBOUR_EXE) :: $(HARBOUR_EXE_OBJS) - IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HARBOUR_EXE) $(**: = ^ @@ -459,8 +459,8 @@ $(PP_LIB) #********************************************************** $(HBPPGEN_EXE) :: $(COMMON_LIB) $(HBPPGEN_EXE) :: $(HBPPGEN_EXE_OBJS) - IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HBPPGEN_EXE) $(**: = ^ @@ -472,8 +472,8 @@ $(COMMON_LIB) #********************************************************** $(HBPP_EXE) :: BasicLibs $(HBPP_EXE) :: $(HBPP_EXE_OBJS) - IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HBPP_EXE) $(**: = ^ @@ -485,8 +485,8 @@ $(COMMON_LIB) #********************************************************** $(HBRUN_EXE) :: BasicLibs BasicExes StdLibs $(HBRUN_EXE) :: $(HBRUN_EXE_OBJS) - IF EXIST "$(HBRUN_EXE)" $(DEL) "$(HBRUN_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HBRUN_EXE)" $(DEL) "$(HBRUN_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HBRUN_EXE) $(**: = ^ @@ -498,8 +498,8 @@ $(STANDARD_STATIC_HBLIBS) #********************************************************** $(HBDOT_EXE) :: BasicLibs BasicExes StdLibs $(HBDOT_EXE) :: $(HBDOT_EXE_OBJS) - IF EXIST "$(HBDOT_EXE)" $(DEL) "$(HBDOT_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HBDOT_EXE)" $(DEL) "$(HBDOT_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HBDOT_EXE) $(**: = ^ @@ -511,8 +511,8 @@ $(STANDARD_STATIC_HBLIBS) #********************************************************** $(HBTEST_EXE) :: BasicLibs BasicExes StdLibs $(HBTEST_EXE) :: $(HBTEST_EXE_OBJS) - IF EXIST "$(HBTEST_EXE)" $(DEL) "$(HBTEST_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HBTEST_EXE)" $(DEL) "$(HBTEST_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HBTEST_EXE) $(**: = ^ @@ -524,8 +524,8 @@ $(STANDARD_STATIC_HBLIBS) #********************************************************** $(HBPPTEST_EXE) :: BasicLibs BasicExes StdLibs $(HBPPTEST_EXE) :: $(HBPPTEST_EXE_OBJS) - IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HBPPTEST_EXE) $(**: = ^ @@ -538,8 +538,8 @@ $(PP_LIB) #********************************************************** $(HBDOC_EXE) :: BasicLibs BasicExes StdLibs $(HBDOC_EXE) :: $(HBDOC_EXE_OBJS) - IF EXIST "$(HBDOC_EXE)" $(DEL) "$(HBDOC_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HBDOC_EXE)" $(DEL) "$(HBDOC_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HBDOC_EXE) $(**: = ^ @@ -551,8 +551,8 @@ $(STANDARD_STATIC_HBLIBS) #********************************************************** $(HBMAKE_EXE) :: BasicLibs BasicExes StdLibs $(HBMAKE_EXE) :: $(HBMAKE_EXE_OBJS) - IF EXIST "$(HBMAKE_EXE)" $(DEL) "$(HBMAKE_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HBMAKE_EXE)" $(DEL) "$(HBMAKE_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HBMAKE_EXE) $(**: = ^ @@ -564,8 +564,8 @@ $(STANDARD_STATIC_HBLIBS) #********************************************************** $(HBVER_EXE) :: BasicLibs BasicExes StdLibs $(HBVER_EXE) :: $(HBVER_EXE_OBJS) - IF EXIST "$(HBVER_EXE)" $(DEL) "$(HBVER_EXE)" > NUL - $(CC) @&&! + IF EXIST "$(HBVER_EXE)" $(DEL) "$(HBVER_EXE)" > NUL + $(CC) @&&! $(CFLAGS) -e$(HBVER_EXE) $(**: = ^ @@ -579,7 +579,7 @@ $(STANDARD_STATIC_HBLIBS) #********************************************************** $(HARBOUR_DLL) :: BasicLibs BasicExes $(HARBOUR_DLL) :: $(DLL_OBJS) - $(LINKER) $(LDFLAGSDLL) @&&! + $(LINKER) $(LDFLAGSDLL) @&&! c0d32.obj $**, $@,, cw32mt$(RTLIBSUFFIX).lib import32.lib ! #********************************************************** @@ -587,7 +587,7 @@ c0d32.obj $**, $@,, cw32mt$(RTLIBSUFFIX).lib import32.lib #********************************************************** $(HBTESTDLL_EXE) :: BasicLibs BasicExes $(HBTESTDLL_EXE) :: $(DLL_OBJ_DIR)\mainstd.obj $(HBTEST_EXE_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR)) - $(LINKER) $(LDFLAGS) @&&! + $(LINKER) $(LDFLAGS) @&&! c0x32.obj $**, $@,,$(HARBOUR_DLL:.dll=.lib) cw32mt$(RTLIBSUFFIX).lib import32.lib ! #---------------------------------------------------------- @@ -596,7 +596,7 @@ c0x32.obj $**, $@,,$(HARBOUR_DLL:.dll=.lib) cw32mt$(RTLIBSUFFIX).lib import32.li # $(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c #---------------------------------------------------------- $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c - $(CC) $(CEXEFLAGSDLL) -o$@ $** + $(CC) $(CEXEFLAGSDLL) -o$@ $** #********************************************************** #********************************************************** @@ -613,41 +613,41 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c # built at the initial phase of build process $(OBJ_DIR)\pptable.obj : $(OBJ_DIR)\pptable.c $(OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c - IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul - $(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q + IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul + $(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q #********************************************************** !if "$(HB_REBUILD_PARSER)" == "yes" $(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y - bison --no-line -d $** -o$@ + bison --no-line -d $** -o$@ $(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y - bison --no-line -d $** -o$@ + bison --no-line -d $** -o$@ $(DLL_OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y - bison --no-line -d $** -o$@ + bison --no-line -d $** -o$@ $(DLL_OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y - bison --no-line -d $** -o$@ + bison --no-line -d $** -o$@ !else $(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.yyc - copy /A $** $@ - copy /A $(**:.yyc=.yyh) $(@:.c=.h) + copy /A $** $@ + copy /A $(**:.yyc=.yyh) $(@:.c=.h) $(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.yyc - copy /A $** $@ - copy /A $(**:.yyc=.yyh) $(@:.c=.h) + copy /A $** $@ + copy /A $(**:.yyc=.yyh) $(@:.c=.h) $(DLL_OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.yyc - copy /A $** $@ - copy /A $(**:.yyc=.yyh) $(@:.c=.h) + copy /A $** $@ + copy /A $(**:.yyc=.yyh) $(@:.c=.h) $(DLL_OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.yyc - copy /A $** $@ - copy /A $(**:.yyc=.yyh) $(@:.c=.h) + copy /A $** $@ + copy /A $(**:.yyc=.yyh) $(@:.c=.h) !endif @@ -670,24 +670,24 @@ Clean: doClean CLEAN: doClean doClean: - -if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul - -if exist $(BIN_DIR)\*.tds $(DEL) $(BIN_DIR)\*.tds > nul - -if exist $(BIN_DIR)\*.tr? $(DEL) $(BIN_DIR)\*.tr? > nul - -if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul - -if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul - -if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul - -if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul - -if exist $(LIB_DIR)\*.bak $(DEL) $(LIB_DIR)\*.bak > nul - -if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul - -if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul - -if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul - -if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul - -if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul - -if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul - -if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul - -if exist gtlibs.mak $(DEL) gtlibs.mak > nul - -if exist bin\*.exe $(DEL) bin\*.exe > nul - -if exist lib\*.lib $(DEL) lib\*.lib > nul + -if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul + -if exist $(BIN_DIR)\*.tds $(DEL) $(BIN_DIR)\*.tds > nul + -if exist $(BIN_DIR)\*.tr? $(DEL) $(BIN_DIR)\*.tr? > nul + -if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul + -if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul + -if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul + -if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul + -if exist $(LIB_DIR)\*.bak $(DEL) $(LIB_DIR)\*.bak > nul + -if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul + -if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul + -if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul + -if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul + -if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul + -if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul + -if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul + -if exist gtlibs.mak $(DEL) gtlibs.mak > nul + -if exist bin\*.exe $(DEL) bin\*.exe > nul + -if exist lib\*.lib $(DEL) lib\*.lib > nul #********************************************************** # INSTALL rules @@ -698,14 +698,14 @@ Install : doInstall INSTALL : doInstall doInstall: $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL) - -if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.exe copy /B $(BIN_DIR)\*.exe $(HB_BIN_INSTALL) > inst_$(HB_CC_NAME).log - -if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.dll copy /B $(BIN_DIR)\*.dll $(HB_BIN_INSTALL) >> inst_$(HB_CC_NAME).log - -if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log - -if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.exe copy /B $(BIN_DIR)\*.exe $(HB_BIN_INSTALL) > inst_$(HB_CC_NAME).log + -if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.dll copy /B $(BIN_DIR)\*.dll $(HB_BIN_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log !if "$(HB_INSTALL_PREFIX)" != "." - -if exist $(HB_INC_INSTALL)\nul copy /A include\*.api $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log - -if exist $(HB_INC_INSTALL)\nul copy /A include\*.ch $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log - -if exist $(HB_INC_INSTALL)\nul copy /A include\*.h $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_INC_INSTALL)\nul copy /A include\*.api $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_INC_INSTALL)\nul copy /A include\*.ch $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_INC_INSTALL)\nul copy /A include\*.h $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log !endif #********************************************************** diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak index fd7d122d44..dc32e6711b 100644 --- a/harbour/make_gcc.mak +++ b/harbour/make_gcc.mak @@ -2,9 +2,9 @@ # $Id$ # -# +#********************************************************** # Makefile for Harbour Project for GNU gcc compiler -# +#********************************************************** # --------------------------------------------------------------- # If you need to set additional compiler/linker options use the @@ -14,46 +14,46 @@ # # NOTE: You can use these envvars to configure the make process: -# (note that these are all optional) +# (note that these are all optional) # -# CFLAGS - Extra C compiler options for libraries and for -# executables -# C_USR - Extra C compiler options for libraries and for -# executables (GNU make compatible envvar) -# CLIBFLAGS - Extra C compiler options for the static libraries -# CLIBFLAGSDLL - Extra C compiler options for the shared libraries +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the static libraries +# CLIBFLAGSDLL - Extra C compiler options for the shared libraries # -# LDFLAGS - Extra linker options for the static libraries -# LDFLAGSDLL - Extra linker options for the shared libraries +# LDFLAGS - Extra linker options for the static libraries +# LDFLAGSDLL - Extra linker options for the shared libraries # -# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes -# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries -# PRG_USR - Extra Harbour compiler options -# (GNU make compatible envvar) -# HB_GT_DEFAULT - The default GT driver, Choose between : -# gtstd (default),gtcgi,gtpca,gttrm,gtcrs,gtsln,gtxwc -# HB_GT_LIB - Set if you want to override the default GT driver -# (search for HB_GT_LIBS for a list of values) +# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes +# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# HB_GT_DEFAULT - The default GT driver, Choose between : +# gtstd (default),gtcgi,gtpca,gttrm,gtcrs,gtsln,gtxwc +# HB_GT_LIB - Set if you want to override the default GT driver +# (search for HB_GT_LIBS for a list of values) # -# HB_GPM_MOUSE - If set to yes enables using GPM mouse driver on console -# HB_WITHOUT_GTSLN - If set to yes causes to not build gtsln -# (if you don't have slang installed) +# HB_GPM_MOUSE - If set to yes enables using GPM mouse driver on console +# HB_WITHOUT_GTSLN - If set to yes causes to not build gtsln +# (if you don't have slang installed) # -# HB_COMMERCE - If set to yes disables pure GNU modules (slang,GPM,...) -# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL -# dll in addition to normal static build (currently not working) -# HB_BUILD_DEBUG - If set to yes causes to compile with debug info -# HB_BUILD_VERBOSE - enables echoing commands being executed -# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by -# bison (you must use bison 2.3 or later) +# HB_COMMERCE - If set to yes disables pure GNU modules (slang,GPM,...) +# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL +# dll in addition to normal static build (currently not working) +# HB_BUILD_DEBUG - If set to yes causes to compile with debug info +# HB_BUILD_VERBOSE - enables echoing commands being executed +# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by +# bison (you must use bison 2.3 or later) # -# HB_INSTALL_PREFIX - Path to instalation directory into which -# Harbour will be installed when the command -# "make_gcc.bat install" is lauched. Defaults -# to current directory +# HB_INSTALL_PREFIX - Path to instalation directory into which +# Harbour will be installed when the command +# "make_gcc.bat install" is lauched. Defaults +# to current directory # -# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. -# Note that this will require the pdflib contrib. +# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. +# Note that this will require the pdflib contrib. # --------------------------------------------------------------- @@ -105,12 +105,12 @@ include common.cf # GUI programs without console. Please note IT IS A # DIRTY HACK and any better solution is HIGHLY WELCOME ifeq ($(HB_ARCHITECTURE),w32) -MAIN_LIB = $(LIB_DIR)/$(LIBPREF)mainstd$(LIBEXT) +MAIN_LIB = $(LIB_DIR)/$(LIBPREF)mainstd$(LIBEXT) MAIN_LIB_OBJS = $(OBJ_DIR)/mainstd$(OBJEXT) VM_STATIC_LIB_OBJS := $(VM_STATIC_LIB_OBJS:$(OBJ_DIR)/mainstd$(OBJEXT)=) STANDARD_STATIC_HBLIBS := $(STANDARD_STATIC_HBLIBS) $(MAIN_LIB) -HB_BUILD_TARGETS := $(MAIN_LIB) $(HB_BUILD_TARGETS) +HB_BUILD_TARGETS := $(MAIN_LIB) $(HB_BUILD_TARGETS) endif #********************************************************** @@ -153,22 +153,22 @@ endif # Main "Include" directory INCLUDE_DIR := include -CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -Iobj/$(HB_CC_NAME) +CFLAGS := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) -Iobj/$(HB_CC_NAME) #----------- ifndef GCC_NOOPTIM -CFLAGS := -O3 $(CFLAGS) +CFLAGS := -O3 $(CFLAGS) endif #----------- ifeq ($(HB_BUILD_DEBUG),yes) -CFLAGS := -g $(CFLAGS) +CFLAGS := -g $(CFLAGS) endif #----------- ifneq ($(HB_GT_DEFAULT),) -CFLAGS += -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt%=%) +CFLAGS += -DHB_GT_DEFAULT=$(HB_GT_DEFAULT:gt%=%) endif #----------- ifneq ($(HB_GT_LIB),) -CFLAGS += -DHB_GT_LIB=$(HB_GT_LIB:gt%=%) +CFLAGS += -DHB_GT_LIB=$(HB_GT_LIB:gt%=%) endif #----------- CLIBFLAGS := -c $(CFLAGS) $(CLIBFLAGS) @@ -265,39 +265,39 @@ $(HB_DEST_DIRS) $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL): $(COMMON_LIB) : $(COMMON_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(PP_LIB) : $(PP_LIB_OBJS) +$(PP_LIB) : $(PP_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** $(COMPILER_LIB) : $(COMPILER_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(VM_LIB) : $(VM_LIB_OBJS) +$(VM_LIB) : $(VM_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** ifeq ($(HB_ARCHITECTURE),w32) -$(MAIN_LIB) : $(MAIN_LIB_OBJS) +$(MAIN_LIB) : $(MAIN_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ endif #********************************************************** -$(RTL_LIB) : $(RTL_LIB_OBJS) +$(RTL_LIB) : $(RTL_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(MACRO_LIB) : $(MACRO_LIB_OBJS) +$(MACRO_LIB) : $(MACRO_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(DEBUG_LIB) : $(DEBUG_LIB_OBJS) +$(DEBUG_LIB) : $(DEBUG_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(LANG_LIB) : $(LANG_LIB_OBJS) +$(LANG_LIB) : $(LANG_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** $(CODEPAGE_LIB) : $(CODEPAGE_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(PCRE_LIB) : $(PCRE_LIB_OBJS) +$(PCRE_LIB) : $(PCRE_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(RDD_LIB) : $(RDD_LIB_OBJS) +$(RDD_LIB) : $(RDD_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** $(NULSYS_LIB) : $(NULSYS_LIB_OBJS) @@ -312,43 +312,43 @@ $(DBFCDX_LIB) : $(DBFCDX_LIB_OBJS) $(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) +$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(HSX_LIB) : $(HSX_LIB_OBJS) +$(HSX_LIB) : $(HSX_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** $(USRRDD_LIB) : $(USRRDD_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTCGI_LIB) : $(GTCGI_LIB_OBJS) +$(GTCGI_LIB) : $(GTCGI_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTSTD_LIB) : $(GTSTD_LIB_OBJS) +$(GTSTD_LIB) : $(GTSTD_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTPCA_LIB) : $(GTPCA_LIB_OBJS) +$(GTPCA_LIB) : $(GTPCA_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTWIN_LIB) : $(GTWIN_LIB_OBJS) +$(GTWIN_LIB) : $(GTWIN_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) +$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTGUI_LIB) : $(GTGUI_LIB_OBJS) +$(GTGUI_LIB) : $(GTGUI_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTTRM_LIB) : $(GTTRM_LIB_OBJS) +$(GTTRM_LIB) : $(GTTRM_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTCRS_LIB) : $(GTCRS_LIB_OBJS) +$(GTCRS_LIB) : $(GTCRS_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTSLN_LIB) : $(GTSLN_LIB_OBJS) +$(GTSLN_LIB) : $(GTSLN_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** -$(GTXWC_LIB) : $(GTXWC_LIB_OBJS) +$(GTXWC_LIB) : $(GTXWC_LIB_OBJS) $(MKLIB) $(ARFLAGS) $@ $^ #********************************************************** @@ -362,15 +362,15 @@ $(HBPPGEN_EXE) : $(HBPPGEN_EXE_OBJS) $(COMMON_LIB) $(HARBOUR_EXE) : $(HARBOUR_EXE_OBJS) $(COMPILER_LIB) $(PP_LIB) $(COMMON_LIB) $(CC) $(CFLAGS) -o$@ $^ $(HB_OS_LIBS) #********************************************************** -$(HBPP_EXE) : $(HBPP_EXE_OBJS) $(COMPILER_LIB) $(PP_LIB) $(COMMON_LIB) +$(HBPP_EXE) : $(HBPP_EXE_OBJS) $(COMPILER_LIB) $(PP_LIB) $(COMMON_LIB) $(CC) $(CFLAGS) -o$@ $^ $(HB_OS_LIBS) #********************************************************** -$(HBRUN_EXE) :: $(StdLibs) -$(HBRUN_EXE) :: $(HBRUN_EXE_OBJS) +$(HBRUN_EXE) :: $(StdLibs) +$(HBRUN_EXE) :: $(HBRUN_EXE_OBJS) $(CC) $(CFLAGS) -o$@ $^ $(LDFLAGS) #********************************************************** -$(HBDOT_EXE) :: $(StdLibs) -$(HBDOT_EXE) :: $(HBDOT_EXE_OBJS) +$(HBDOT_EXE) :: $(StdLibs) +$(HBDOT_EXE) :: $(HBDOT_EXE_OBJS) $(CC) $(CFLAGS) -o$@ $^ $(LDFLAGS) #********************************************************** $(HBTEST_EXE) :: $(StdLibs) @@ -381,16 +381,16 @@ $(HBPPTEST_EXE) :: $(StdLibs) $(HBPPTEST_EXE) :: $(HBPPTEST_EXE_OBJS) $(CC) $(CFLAGS) -o$@ $^ $(LDFLAGS) #********************************************************** -$(HBDOC_EXE) :: $(StdLibs) -$(HBDOC_EXE) :: $(HBDOC_EXE_OBJS) +$(HBDOC_EXE) :: $(StdLibs) +$(HBDOC_EXE) :: $(HBDOC_EXE_OBJS) $(CC) $(CFLAGS) -o$@ $^ $(LDFLAGS) #********************************************************** $(HBMAKE_EXE) :: $(StdLibs) $(HBMAKE_EXE) :: $(HBMAKE_EXE_OBJS) $(CC) $(CFLAGS) -o$@ $^ $(LDFLAGS) #********************************************************** -$(HBVER_EXE) :: $(StdLibs) -$(HBVER_EXE) :: $(HBVER_EXE_OBJS) +$(HBVER_EXE) :: $(StdLibs) +$(HBVER_EXE) :: $(HBVER_EXE_OBJS) $(CC) $(CFLAGS) -o$@ $^ $(HB_OS_LIBS) #********************************************************** @@ -402,7 +402,7 @@ $(HBVER_EXE) :: $(HBVER_EXE_OBJS) # Generated by an intermediate utility hbppgen.exe # built at the initial phase of build process $(OBJ_DIR)/pptable$(OBJEXT) : $(OBJ_DIR)/pptable.c -$(OBJ_DIR)/pptable.c : $(HBPPGEN) include/hbstdgen.ch include/std.ch $(PP_DIR)/ppcore.c $(PP_DIR)/hbppgen.c +$(OBJ_DIR)/pptable.c : $(HBPPGEN) include/hbstdgen.ch include/std.ch $(PP_DIR)/ppcore.c $(PP_DIR)/hbppgen.c $< include/hbstdgen.ch -o$@ -q #********************************************************** @@ -430,10 +430,10 @@ endif #********************************************************** #$(OBJ_DIR)/macrol.c : $(MACRO_DIR)/macro.l -# flex -Phb_macro -i -8 -o$@ $** +# flex -Phb_macro -i -8 -o$@ $** #$(OBJ_DIR)/harbourl.c : $(COMPILER_DIR)/harbour.l -# flex -Phb_comp -i -8 -o$@ $** +# flex -Phb_comp -i -8 -o$@ $** #$(OBJ_DIR)/harbourl$(OBJEXT) : $(OBJ_DIR)/harbourl.c #$(OBJ_DIR)/macrol$(OBJEXT) : $(OBJ_DIR)/macrol.c @@ -468,10 +468,10 @@ endif #********************************************************** #$(DLL_OBJ_DIR)/macrol.c : $(MACRO_DIR)/macro.l -# flex -Phb_macro -i -8 -o$@ $** +# flex -Phb_macro -i -8 -o$@ $** #$(DLL_OBJ_DIR)/harbourl.c : $(COMPILER_DIR)/harbour.l -# flex -Phb_comp -i -8 -o$@ $** +# flex -Phb_comp -i -8 -o$@ $** #$(DLL_OBJ_DIR)/harbourl$(OBJEXT) : $(DLL_OBJ_DIR)/harbourl.c #$(DLL_OBJ_DIR)/macrol$(OBJEXT) : $(DLL_OBJ_DIR)/macrol.c @@ -513,9 +513,9 @@ doInstall: $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL) do \ [ -f "$$n" ] && \ case $$n in \ - *$(DLLEXT) ) $(COPY) $$n $(HB_BIN_INSTALL);; \ - *$(LIBEXT) ) $(COPY) $$n $(HB_LIB_INSTALL);; \ - *$(EXEEXT) ) $(COPY) $$n $(HB_BIN_INSTALL);; \ + *$(DLLEXT) ) $(COPY) $$n $(HB_BIN_INSTALL);; \ + *$(LIBEXT) ) $(COPY) $$n $(HB_LIB_INSTALL);; \ + *$(EXEEXT) ) $(COPY) $$n $(HB_BIN_INSTALL);; \ esac \ done ifneq ("$(HB_INSTALL_PREFIX)",".") diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index d6ed65f1a6..d6822c1dbd 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -2,9 +2,9 @@ # $Id$ # -# +#********************************************************** # Makefile for Harbour Project for Msvc compilers -# +#********************************************************** # --------------------------------------------------------------- # If you need to set additional compiler/linker options use the @@ -14,40 +14,40 @@ # # NOTE: You can use these envvars to configure the make process: -# (note that these are all optional) +# (note that these are all optional) # -# CFLAGS - Extra C compiler options for libraries and for -# executables -# C_USR - Extra C compiler options for libraries and for -# executables (GNU make compatible envvar) -# CLIBFLAGS - Extra C compiler options for the static libraries -# CLIBFLAGSDLL - Extra C compiler options for the shared libraries +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the static libraries +# CLIBFLAGSDLL - Extra C compiler options for the shared libraries # -# LDFLAGS - Extra linker options for the static libraries -# LDFLAGSDLL - Extra linker options for the shared libraries +# LDFLAGS - Extra linker options for the static libraries +# LDFLAGSDLL - Extra linker options for the shared libraries # -# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes -# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries -# PRG_USR - Extra Harbour compiler options -# (GNU make compatible envvar) -# HB_GT_DEFAULT - The default GT driver, Choose between : -# gtstd (default),gtcgi,gtwin,gtwvt -# HB_GT_LIB - To override the default GT driver -# (search for HB_GT_LIBS for a list of values) -# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL -# dll in addition to normal static build -# HB_BUILD_MODE - If set to cpp causes to compile in C++ mode -# HB_BUILD_DEBUG - If set to yes causes to compile with debug info -# HB_BUILD_VERBOSE - enables echoing commands being executed -# HB_INSTALL_PREFIX - Path to instalation directory into which -# Harbour will be installed when the command -# "make_vc.bat install" is lauched. Defaults -# to current directory -# HB_VISUALC_VER - Version of Visual C++ compiler (defaults to 60). -# Possible values are : 60, 70, 71, 80 +# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes +# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# HB_GT_DEFAULT - The default GT driver, Choose between : +# gtstd (default),gtcgi,gtwin,gtwvt +# HB_GT_LIB - To override the default GT driver +# (search for HB_GT_LIBS for a list of values) +# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL +# dll in addition to normal static build +# HB_BUILD_MODE - If set to cpp causes to compile in C++ mode +# HB_BUILD_DEBUG - If set to yes causes to compile with debug info +# HB_BUILD_VERBOSE - enables echoing commands being executed +# HB_INSTALL_PREFIX - Path to instalation directory into which +# Harbour will be installed when the command +# "make_vc.bat install" is lauched. Defaults +# to current directory +# HB_VISUALC_VER - Version of Visual C++ compiler (defaults to 60). +# Possible values are : 60, 70, 71, 80 # -# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. -# Note that this will require the pdflib contrib. +# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. +# Note that this will require the pdflib contrib. # --------------------------------------------------------------- # "echo." intentionally used instead of "echo", to avoid conflicts @@ -145,22 +145,22 @@ CFLAGS_VER = -Ot2b1 -EHs-c- -FD -Gs -D_CRT_SECURE_NO_DEPRECATE CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX -FD -Gs !endif -CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -T$(HB_BUILD_MODE) -W3 -nologo -D__WINDOWS__ -DWIN32 -D__WIN32__ $(C_USR) $(CFLAGS) -Iobj\$(HB_CC_NAME) +CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -T$(HB_BUILD_MODE) -W3 -nologo -D__WINDOWS__ -DWIN32 -D__WIN32__ $(C_USR) $(CFLAGS) -Iobj\$(HB_CC_NAME) #----------- !if "$(HB_BUILD_DEBUG)" == "yes" -CFLAGS = -Zi $(CFLAGS) +CFLAGS = -Zi $(CFLAGS) DBGMARKER = d !endif #----------- !if "$(HB_GT_DEFAULT)" != "" -CFLAGS = -D"HB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=)" $(CFLAGS) +CFLAGS = -D"HB_GT_DEFAULT=$(HB_GT_DEFAULT:gt=)" $(CFLAGS) !endif #----------- !if "$(HB_GT_LIB)" != "" -CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS) +CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS) !endif #----------- -CFLAGS = -MT$(DBGMARKER) $(CFLAGS) +CFLAGS = -MT$(DBGMARKER) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDLL = -D__EXPORT__ $(CLIBFLAGS) $(CLIBFLAGSDLL) @@ -175,10 +175,10 @@ HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) # Linker Flags -LDFLAGS = /NOLOGO /SUBSYSTEM:console /OPT:WIN98 /LIBPATH:$(LIB_DIR) $(LDFLAGS) +LDFLAGS = /NOLOGO /SUBSYSTEM:console /OPT:WIN98 /LIBPATH:$(LIB_DIR) $(LDFLAGS) LDFLAGSDLL = /NOLOGO /DLL /OPT:WIN98 /LIBPATH:$(LIB_DIR) $(LDFLAGSDLL) !if "$(HB_BUILD_DEBUG)" == "yes" -LDFLAGS = /DEBUG $(LDFLAGS) +LDFLAGS = /DEBUG $(LDFLAGS) LDFLAGSDLL = /DEBUG $(LDFLAGSDLL) !endif @@ -190,327 +190,327 @@ LDFLAGSDLL = /DEBUG $(LDFLAGSDLL) # General *.c --> *.obj COMPILE rules for STATIC Libraries #******************************************************* {$(OBJ_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(MAIN_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(COMMON_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(COMPILER_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(PP_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(VM_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(RTL_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(MACRO_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(DEBUG_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(LANG_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(CODEPAGE_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(PCRE_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(RDD_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(NULSYS_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(DBFNTX_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(DBFCDX_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(DBFFPT_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBSIX_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HSX_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(USRRDD_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTCGI_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTPCA_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTSTD_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTWIN_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTWVT_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(GTGUI_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(COMPILER_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBPP_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBPPTEST_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBRUN_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBDOT_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBTEST_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBDOC_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBMAKE_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* {$(HBVER_DIR)}.c{$(OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #******************************************************* #******************************************************* # General *.prg --> *.obj COMPILE rules for STATIC Libraries #******************************************************* {$(OBJ_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(COMMON_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(PP_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(VM_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(RTL_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(MACRO_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(DEBUG_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(LANG_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(CODEPAGE_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(PCRE_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(RDD_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(NULSYS_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(DBFNTX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(DBFCDX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(DBFFPT_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBSIX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HSX_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(USRRDD_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTCGI_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTPCA_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTSTD_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTWIN_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTWVT_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(GTGUI_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(COMPILER_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBPP_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBPPTEST_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) $< -o$(OBJ_DIR)\\ - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) $< -o$(OBJ_DIR)\\ + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBRUN_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBDOT_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBTEST_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBDOC_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBMAKE_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* {$(HBVER_DIR)}.prg{$(OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #******************************************************* #******************************************************* # General *.c --> *.obj COMPILE rules for SHARED Libraries #******************************************************* {$(DLL_OBJ_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(MAIN_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(COMMON_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(COMPILER_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(PP_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(VM_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(RTL_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(MACRO_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(DEBUG_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(LANG_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(CODEPAGE_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(PCRE_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(RDD_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(NULSYS_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(DBFNTX_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(DBFCDX_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(DBFFPT_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBSIX_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HSX_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(USRRDD_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTCGI_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTPCA_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTSTD_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTWIN_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTWVT_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(GTGUI_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* #******************************************************* @@ -524,125 +524,125 @@ LDFLAGSDLL = /DEBUG $(LDFLAGSDLL) # $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBPPTEST_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBRUN_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBDOT_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBTEST_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBDOC_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBMAKE_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* {$(HBVER_DIR)}.c{$(DLL_OBJ_DIR)}$(OBJEXT):: - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $< #******************************************************* #******************************************************* # General *.prg --> *.obj COMPILE rules for SHARED Libraries #******************************************************* {$(DLL_OBJ_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(COMMON_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(PP_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(VM_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(RTL_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(MACRO_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(DEBUG_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(LANG_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(PCRE_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(CODEPAGE_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(RDD_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(NULSYS_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(DBFNTX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(DBFCDX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(DBFFPT_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBSIX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HSX_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(USRRDD_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTCGI_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTPCA_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTSTD_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTWIN_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTWVT_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(GTGUI_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* #******************************************************* @@ -658,32 +658,32 @@ LDFLAGSDLL = /DEBUG $(LDFLAGSDLL) # $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBPPTEST_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBRUN_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBDOT_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBTEST_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBDOC_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBMAKE_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #******************************************************* {$(HBVER_DIR)}.prg{$(DLL_OBJ_DIR)}$(OBJEXT): - $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c + $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $< + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #********************************************************** #********************************************************** @@ -716,7 +716,7 @@ all : $(HB_DEST_DIRS) $(HB_BUILD_TARGETS) #********************************************************** $(HB_DEST_DIRS) $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL): - !if not exist $@\nul mkdir $@ + !if not exist $@\nul mkdir $@ #********************************************************** # @@ -724,79 +724,79 @@ $(HB_DEST_DIRS) $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL): # #********************************************************** $(COMMON_LIB) : $(COMMON_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(PP_LIB) : $(PP_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(PP_LIB) : $(PP_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** $(COMPILER_LIB) : $(COMPILER_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(VM_LIB) : $(VM_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(VM_LIB) : $(VM_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(RTL_LIB) : $(RTL_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(RTL_LIB) : $(RTL_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(MACRO_LIB) : $(MACRO_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(MACRO_LIB) : $(MACRO_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(DEBUG_LIB) : $(DEBUG_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(DEBUG_LIB) : $(DEBUG_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(LANG_LIB) : $(LANG_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(LANG_LIB) : $(LANG_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** $(CODEPAGE_LIB) : $(CODEPAGE_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(PCRE_LIB) : $(PCRE_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(PCRE_LIB) : $(PCRE_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(RDD_LIB) : $(RDD_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(RDD_LIB) : $(RDD_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** $(NULSYS_LIB) : $(NULSYS_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** $(DBFNTX_LIB) : $(DBFNTX_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** $(DBFCDX_LIB) : $(DBFCDX_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** $(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(HSX_LIB) : $(HSX_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(HSX_LIB) : $(HSX_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** $(USRRDD_LIB) : $(USRRDD_LIB_OBJS) - $(MKLIB) /out:$@ $** + $(MKLIB) /out:$@ $** #********************************************************** -$(GTCGI_LIB) : $(GTCGI_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTCGI_LIB) : $(GTCGI_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTDOS_LIB) : $(GTDOS_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTDOS_LIB) : $(GTDOS_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTPCA_LIB) : $(GTPCA_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTPCA_LIB) : $(GTPCA_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTSTD_LIB) : $(GTSTD_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTSTD_LIB) : $(GTSTD_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTWIN_LIB) : $(GTWIN_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTWIN_LIB) : $(GTWIN_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** -$(GTGUI_LIB) : $(GTGUI_LIB_OBJS) - $(MKLIB) /out:$@ $** +$(GTGUI_LIB) : $(GTGUI_LIB_OBJS) + $(MKLIB) /out:$@ $** #********************************************************** #********************************************************** @@ -807,8 +807,8 @@ $(GTGUI_LIB) : $(GTGUI_LIB_OBJS) # HARBOUR build rule #********************************************************** $(HARBOUR_EXE) : $(HARBOUR_EXE_OBJS) - IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HARBOUR_EXE) $(**: = ^ @@ -821,8 +821,8 @@ $(PP_LIB) # HBPPGEN build rule #********************************************************** $(HBPPGEN_EXE) : $(HBPPGEN_EXE_OBJS) - IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBPPGEN_EXE) $(**: = ^ @@ -833,8 +833,8 @@ $(COMMON_LIB) # HBPP build rule #********************************************************** $(HBPP_EXE) : $(HBPP_EXE_OBJS) - IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBPP_EXE) $(**: = ^ @@ -845,8 +845,8 @@ $(COMMON_LIB) # HBRUN build rule #********************************************************** $(HBRUN_EXE) : $(HBRUN_EXE_OBJS) - IF EXIST "$(HBRUN_EXE)" $(DEL) "$(HBRUN_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBRUN_EXE)" $(DEL) "$(HBRUN_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBRUN_EXE) $(**: = ^ @@ -858,8 +858,8 @@ user32.lib winspool.lib wsock32.lib advapi32.lib # HBDOT build rule #********************************************************** $(HBDOT_EXE) : $(HBDOT_EXE_OBJS) - IF EXIST "$(HBDOT_EXE)" $(DEL) "$(HBDOT_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBDOT_EXE)" $(DEL) "$(HBDOT_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBDOT_EXE) $(**: = ^ @@ -871,8 +871,8 @@ user32.lib winspool.lib wsock32.lib advapi32.lib # HBTEST build rule #********************************************************** $(HBTEST_EXE) : $(HBTEST_EXE_OBJS) - IF EXIST "$(HBTEST_EXE)" $(DEL) "$(HBTEST_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBTEST_EXE)" $(DEL) "$(HBTEST_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBTEST_EXE) $(**: = ^ @@ -884,8 +884,8 @@ user32.lib winspool.lib # HBPPTEST build rule #********************************************************** $(HBPPTEST_EXE) : $(HBPPTEST_EXE_OBJS) - IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBPPTEST_EXE) $(**: = ^ @@ -898,8 +898,8 @@ user32.lib winspool.lib # HBDOC build rule #********************************************************** $(HBDOC_EXE) : $(HBDOC_EXE_OBJS) - IF EXIST "$(HBDOC_EXE)" $(DEL) "$(HBDOC_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBDOC_EXE)" $(DEL) "$(HBDOC_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBDOC_EXE) $(**: = ^ @@ -911,8 +911,8 @@ user32.lib winspool.lib # HBMAKE build rule #********************************************************** $(HBMAKE_EXE) : $(HBMAKE_EXE_OBJS) - IF EXIST "$(HBMAKE_EXE)" $(DEL) "$(HBMAKE_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBMAKE_EXE)" $(DEL) "$(HBMAKE_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBMAKE_EXE) $(**: = ^ @@ -924,8 +924,8 @@ user32.lib winspool.lib # HBVER build rule #********************************************************** $(HBVER_EXE) : $(HBVER_EXE_OBJS) - IF EXIST "$(HBVER_EXE)" $(DEL) "$(HBVER_EXE)" > nul - $(LINKER) @<< + IF EXIST "$(HBVER_EXE)" $(DEL) "$(HBVER_EXE)" > nul + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBVER_EXE) $(**: = ^ @@ -940,7 +940,7 @@ user32.lib winspool.lib #********************************************************** #$(HARBOUR_DLL) : $(HARBOUR_EXE) $(DLL_OBJS) $(HARBOUR_DLL) : $(HB) $(DLL_OBJS) - $(LINKER) @<< + $(LINKER) @<< $(LDFLAGSDLL) /OUT:$(@) /IMPLIB:$(@:.dll=.lib) $(DLL_OBJS: = ^ @@ -952,7 +952,7 @@ advapi32.lib gdi32.lib user32.lib winspool.lib wsock32.lib #********************************************************** HBTESTDLL_OBJS = $(DLL_OBJ_DIR)\mainstd.obj $(HBTEST_EXE_OBJS:obj\vc=obj\dll\vc) $(HBTESTDLL_EXE) : $(HARBOUR_DLL) $(HBTESTDLL_OBJS) - $(LINKER) @<< + $(LINKER) @<< $(LDFLAGS) /OUT:$(HBTESTDLL_EXE) $(HBTESTDLL_OBJS: = ^ @@ -965,7 +965,7 @@ $(HARBOUR_DLL:.dll=.lib) # $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c #---------------------------------------------------------- $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c - $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $** + $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $** #********************************************************** #********************************************************** #********************************************************** @@ -979,42 +979,42 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c # built at the initial phase of build process $(OBJ_DIR)\pptable.obj : $(OBJ_DIR)\pptable.c $(OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c - IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul - $(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q + IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul + $(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q #********************************************************** !if "$(HB_REBUILD_PARSER)" == "yes" $(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y - bison --no-line -d $** -o$@ + bison --no-line -d $** -o$@ $(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y - bison --no-line -d $** -o$@ + bison --no-line -d $** -o$@ $(DLL_OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y - bison --no-line -d $** -o$@ + bison --no-line -d $** -o$@ $(DLL_OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y - bison --no-line -d $** -o$@ + bison --no-line -d $** -o$@ !else $(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.yyc - copy /A $** $@ - copy /A $(**:.yyc=.yyh) $(@:.c=.h) + copy /A $** $@ + copy /A $(**:.yyc=.yyh) $(@:.c=.h) $(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.yyc - copy /A $** $@ - copy /A $(**:.yyc=.yyh) $(@:.c=.h) + copy /A $** $@ + copy /A $(**:.yyc=.yyh) $(@:.c=.h) $(DLL_OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.yyc - copy /A $** $@ - copy /A $(**:.yyc=.yyh) $(@:.c=.h) + copy /A $** $@ + copy /A $(**:.yyc=.yyh) $(@:.c=.h) $(DLL_OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.yyc - copy /A $** $@ - copy /A $(**:.yyc=.yyh) $(@:.c=.h) + copy /A $** $@ + copy /A $(**:.yyc=.yyh) $(@:.c=.h) !endif @@ -1036,27 +1036,27 @@ Clean: doClean CLEAN: doClean doClean: - -if exist *.idb $(DEL) *.idb > nul - -if exist *.pch $(DEL) *.pch > nul - -if exist *.pdb $(DEL) *.pdb > nul - -if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul - -if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul - -if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul - -if exist $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > nul - -if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul - -if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul - -if exist $(BIN_DIR)\*.pdb $(DEL) $(BIN_DIR)\*.pdb > nul - -if exist $(BIN_DIR)\*.ilk $(DEL) $(BIN_DIR)\*.ilk > nul - -if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul - -if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul - -if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul - -if exist $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > nul - -if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul - -if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul - -if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul - -if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul - -if exist bin\*.exe $(DEL) bin\*.exe > nul - -if exist lib\*.lib $(DEL) lib\*.lib > nul + -if exist *.idb $(DEL) *.idb > nul + -if exist *.pch $(DEL) *.pch > nul + -if exist *.pdb $(DEL) *.pdb > nul + -if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul + -if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul + -if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul + -if exist $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > nul + -if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul + -if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul + -if exist $(BIN_DIR)\*.pdb $(DEL) $(BIN_DIR)\*.pdb > nul + -if exist $(BIN_DIR)\*.ilk $(DEL) $(BIN_DIR)\*.ilk > nul + -if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul + -if exist $(BIN_DIR)\*.dll $(DEL) $(BIN_DIR)\*.dll > nul + -if exist $(BIN_DIR)\*.lib $(DEL) $(BIN_DIR)\*.lib > nul + -if exist $(BIN_DIR)\*.exp $(DEL) $(BIN_DIR)\*.exp > nul + -if exist $(DLL_OBJ_DIR)\*.obj $(DEL) $(DLL_OBJ_DIR)\*.obj > nul + -if exist $(DLL_OBJ_DIR)\*.c $(DEL) $(DLL_OBJ_DIR)\*.c > nul + -if exist $(DLL_OBJ_DIR)\*.h $(DEL) $(DLL_OBJ_DIR)\*.h > nul + -if exist inst_$(HB_CC_NAME).log $(DEL) inst_$(HB_CC_NAME).log > nul + -if exist bin\*.exe $(DEL) bin\*.exe > nul + -if exist lib\*.lib $(DEL) lib\*.lib > nul #********************************************************** # INSTALL rules @@ -1067,14 +1067,14 @@ Install : doInstall INSTALL : doInstall doInstall: $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL) - -if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.exe copy /B /Y $(BIN_DIR)\*.exe $(HB_BIN_INSTALL) > inst_$(HB_CC_NAME).log - -if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.dll copy /B /Y $(BIN_DIR)\*.dll $(HB_BIN_INSTALL) >> inst_$(HB_CC_NAME).log - -if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B /Y $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log - -if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B /Y $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.exe copy /B /Y $(BIN_DIR)\*.exe $(HB_BIN_INSTALL) > inst_$(HB_CC_NAME).log + -if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.dll copy /B /Y $(BIN_DIR)\*.dll $(HB_BIN_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B /Y $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B /Y $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log !if "$(HB_INSTALL_PREFIX)" != "." - -if exist $(HB_INC_INSTALL)\nul copy /A /Y include\*.api $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log - -if exist $(HB_INC_INSTALL)\nul copy /A /Y include\*.ch $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log - -if exist $(HB_INC_INSTALL)\nul copy /A /Y include\*.h $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_INC_INSTALL)\nul copy /A /Y include\*.api $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_INC_INSTALL)\nul copy /A /Y include\*.ch $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log + -if exist $(HB_INC_INSTALL)\nul copy /A /Y include\*.h $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log !endif #********************************************************** diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index d28625d4dc..f06ff382f0 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -2,9 +2,9 @@ # $Id: makefile.vc 7563 2007-06-27 17:00:34Z druzus $ # -# +#********************************************************** # Makefile for Harbour Project for MSVC-8.0/WinCE compilers -# +#********************************************************** # --------------------------------------------------------------- # If you need to set additional compiler/linker options use the