This commit is contained in:
Marek Paliwoda
2007-11-21 16:45:29 +00:00
parent 0f3a317e54
commit 4d13dd77f5
33 changed files with 1822 additions and 1750 deletions

View File

@@ -8,103 +8,103 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
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<name> 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( <cValue> [, <nStart>] ) -> <nChkSum>
is exactly the same function as in Harbour:
HB_ADLER32( <cValue> [, <nStart>] ) -> <nChkSum>
with the exception to bug with negative values fixed in Harbour only.
2007-11-20 17:02 UTC+0100 Miguel Angel Marchuet Frutos <miguelangel@marchuet.net>
* contrib/xhb/common.mak
+ Added some missing lines (suggested by Juan Gálvez)
2007-11-20 13:45 UTC+0100 Miguel Angel Marchuet Frutos <miguelangel@marchuet.net>
* 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

File diff suppressed because it is too large Load Diff

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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
@<<mk_all.bat
@%%COMSPEC%% /c mk_one.bat $(DIRS: =^
@%%COMSPEC%% /c mk_one.bat )
<<KEEP
@if exist mk_all.bat $(DEL) mk_all.bat > nul
@if exist mk_one.bat $(DEL) mk_one.bat > nul
@if exist mk_trg.bat $(DEL) mk_trg.bat > nul
#**********************************************************

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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
#**********************************************************

View File

@@ -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
@<<delall.bat
@%%COMSPEC%% /c delone.bat $(LIB_OBJS:.obj=^
@%%COMSPEC%% /c delone.bat )
<<KEEP
@if exist delall.bat $(DEL) delall.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
@<<delall.bat
@%%COMSPEC%% /c delone.bat $(ALL_HEADERS: =^
@%%COMSPEC%% /c delone.bat )
<<KEEP
@if exist delall.bat $(DEL) delall.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
@<<cpyall.bat
@%%COMSPEC%% /c cpyone.bat $(ALL_HEADERS: =^
@%%COMSPEC%% /c cpyone.bat )
<<KEEP
@if exist cpyall.bat $(DEL) cpyall.bat > nul
@if exist cpyone.bat $(DEL) cpyone.bat > nul
@if exist cpyall.bat $(DEL) cpyall.bat > nul
#**********************************************************

View File

@@ -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

View File

@@ -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 <<alldel.bat
call delone.bat $(LIB_OBJS:.obj=^
call delone.bat )
<<KEEP
$(ECHO) @echo off > 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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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
#**********************************************************

View File

@@ -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)",".")

File diff suppressed because it is too large Load Diff

View File

@@ -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