From 61415bf57f6e1531face9e9f7d662898fcc92f25 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 30 Nov 2009 10:53:51 +0000 Subject: [PATCH] 2009-11-30 11:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * bin/hb-mkimp.bat * contrib/hbqt/hbqt.hbc * contrib/hbqt/hbqts.hbc * contrib/gtqtc/gtqtcs.hbc * contrib/gtqtc/gtqtc.hbc * utils/hbmk2/examples/xhgtk.hbc * config/global.mk + Eliminated HB_DIR_* envvar requirement to find required 3rd party component libs. This means that it's now enough to only set HB_WITH_* envvars to enable HB_BUILD_IMPLIB. This should make configuration a lot simpler, and this clears the last pending TODO in this area. HB_INC_* won't work this way, so please start to migrate to HB_WITH_* envvars, the values should stay the same. * external/pcre/cnv_o2hb.bat * external/pcre/cnv_hb2o.bat * Updated comment. --- harbour/ChangeLog | 22 +++ harbour/INSTALL | 20 -- harbour/bin/hb-mkimp.bat | 248 ++++++++++++------------- harbour/config/global.mk | 1 - harbour/contrib/gtqtc/gtqtc.hbc | 2 +- harbour/contrib/gtqtc/gtqtcs.hbc | 2 +- harbour/contrib/hbqt/hbqt.hbc | 2 +- harbour/contrib/hbqt/hbqts.hbc | 2 +- harbour/external/pcre/cnv_hb2o.bat | 2 +- harbour/external/pcre/cnv_o2hb.bat | 2 +- harbour/utils/hbmk2/examples/xhgtk.hbc | 14 +- 11 files changed, 159 insertions(+), 158 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 721f9091db..27431d3664 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,28 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-30 11:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * bin/hb-mkimp.bat + * contrib/hbqt/hbqt.hbc + * contrib/hbqt/hbqts.hbc + * contrib/gtqtc/gtqtcs.hbc + * contrib/gtqtc/gtqtc.hbc + * utils/hbmk2/examples/xhgtk.hbc + * config/global.mk + + Eliminated HB_DIR_* envvar requirement to find required 3rd + party component libs. + This means that it's now enough to only set HB_WITH_* envvars + to enable HB_BUILD_IMPLIB. + This should make configuration a lot simpler, and this clears + the last pending TODO in this area. + HB_INC_* won't work this way, so please start to migrate to + HB_WITH_* envvars, the values should stay the same. + + * external/pcre/cnv_o2hb.bat + * external/pcre/cnv_hb2o.bat + * Updated comment. + 2009-11-30 08:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * INSTALL ! Typos in latest modification. diff --git a/harbour/INSTALL b/harbour/INSTALL index 5004164690..4b8767e1ab 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -828,26 +828,6 @@ HARBOUR set HB_WITH_QT=C:\Qt\include -->8-- - --8<-- - rem ; Add these *before* above sample scripts to configure 3rd party dependencies - rem for implib generation. These environment variables must point to the *root - rem directory* of given projects. - set HB_DIR_ADS=C:\ads\acesdk - set HB_DIR_ALLEGRO=C:\allegro - set HB_DIR_APOLLO=C:\Apollo - set HB_DIR_BLAT=C:\blat - set HB_DIR_CURL=C:\curl - set HB_DIR_FIREBIRD=C:\Firebird - set HB_DIR_FREEIMAGE=C:\FreeImage - set HB_DIR_GD=C:\gd - set HB_DIR_MYSQL=C:\mysql - set HB_DIR_OPENSSL=C:\openssl - set HB_DIR_PGSQL=C:\pgsql - set HB_DIR_QT=C:\Qt - - set HB_BUILD_IMPLIB=yes - -->8-- - --8<-- rem ; To create installation packages (.exe + .zip), rem add these lines before above sample scripts and diff --git a/harbour/bin/hb-mkimp.bat b/harbour/bin/hb-mkimp.bat index 8ac64f4fd4..56226a653c 100644 --- a/harbour/bin/hb-mkimp.bat +++ b/harbour/bin/hb-mkimp.bat @@ -14,7 +14,7 @@ rem This script requires: rem - Windows NT or upper rem - C compiler in PATH rem - HB_COMPILER and HB_LIB_INSTALL envvars set -rem - HB_DIR_* envvars pointing to installed 3rd party packages +rem - HB_WITH_* envvars pointing to installed 3rd party _headers_ rem - GNU Sed (sed.exe) for some msvc and msvc64 targets rem --------------------------------------------------------------- @@ -27,165 +27,165 @@ if not "%HB_LIB_INSTALL%" == "" ( if "%HB_COMPILER%" == "bcc" ( - if exist "%HB_DIR_ADS%\Redistribute\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\Redistribute\ace32.dll" - if exist "%HB_DIR_ADS%\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\ace32.dll" - if exist "%HB_DIR_ADS%\32bit\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\32bit\ace32.dll" - if exist "%HB_DIR_ALLEGRO%\bin\alleg42.dll" implib -a "%HB_LIB_INSTALL%\alleg.lib" "%HB_DIR_ALLEGRO%\bin\alleg42.dll" - if exist "%HB_DIR_APOLLO%\sde61.dll" implib "%HB_LIB_INSTALL%\sde61.lib" "%HB_DIR_APOLLO%\sde61.dll" - if exist "%HB_DIR_BLAT%\full\blat.dll" implib -a "%HB_LIB_INSTALL%\blat.lib" "%HB_DIR_BLAT%\full\blat.dll" - if exist "%HB_DIR_CURL%\libcurl.dll" implib -a "%HB_LIB_INSTALL%\libcurl.lib" "%HB_DIR_CURL%\libcurl.dll" - if exist "%HB_DIR_CURL%\bin\libcurl.dll" implib -a "%HB_LIB_INSTALL%\libcurl.lib" "%HB_DIR_CURL%\bin\libcurl.dll" - if exist "%HB_DIR_FIREBIRD%\lib\fbclient_bor.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_bor.lib" "%HB_LIB_INSTALL%\fbclient.lib" - if exist "%HB_DIR_FREEIMAGE%\Dist\FreeImage.dll" implib "%HB_LIB_INSTALL%\FreeImage.lib" "%HB_DIR_FREEIMAGE%\Dist\FreeImage.dll" - if exist "%HB_DIR_GD%\bin\bgd.dll" implib "%HB_LIB_INSTALL%\bgd.lib" "%HB_DIR_GD%\bin\bgd.dll" - if exist "%HB_DIR_LIBHARU%\libhpdf.dll" implib "%HB_LIB_INSTALL%\libhpdf.lib" "%HB_DIR_LIBHARU%\libhpdf.dll" - if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll" implib "%HB_LIB_INSTALL%\libhpdf.lib" "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll" - if exist "%HB_DIR_MYSQL%\bin\libmySQL.dll" implib "%HB_LIB_INSTALL%\libmysql.lib" "%HB_DIR_MYSQL%\bin\libmySQL.dll" - if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\out32dll\libeay32.dll" - if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" - if exist "%HB_DIR_OPENSSL%\dll\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\dll\libeay32.dll" - if exist "%HB_DIR_OPENSSL%\dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\dll\ssleay32.dll" - if exist "%HB_DIR_OPENSSL%\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\libeay32.dll" - if exist "%HB_DIR_OPENSSL%\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\ssleay32.dll" - if exist "%HB_DIR_PGSQL%\lib\libpq.dll" implib -a "%HB_LIB_INSTALL%\libpq.lib" "%HB_DIR_PGSQL%\lib\libpq.dll" + if exist "%HB_WITH_ADS%\Redistribute\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_WITH_ADS%\Redistribute\ace32.dll" + if exist "%HB_WITH_ADS%\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_WITH_ADS%\ace32.dll" + if exist "%HB_WITH_ADS%\32bit\ace32.dll" implib "%HB_LIB_INSTALL%\ace32.lib" "%HB_WITH_ADS%\32bit\ace32.dll" + if exist "%HB_WITH_ALLEGRO%\..\bin\alleg42.dll" implib -a "%HB_LIB_INSTALL%\alleg.lib" "%HB_WITH_ALLEGRO%\..\bin\alleg42.dll" + if exist "%HB_WITH_APOLLO%\..\sde61.dll" implib "%HB_LIB_INSTALL%\sde61.lib" "%HB_WITH_APOLLO%\..\sde61.dll" + if exist "%HB_WITH_BLAT%\..\blat.dll" implib -a "%HB_LIB_INSTALL%\blat.lib" "%HB_WITH_BLAT%\..\blat.dll" + if exist "%HB_WITH_CURL%\..\libcurl.dll" implib -a "%HB_LIB_INSTALL%\libcurl.lib" "%HB_WITH_CURL%\..\libcurl.dll" + if exist "%HB_WITH_CURL%\..\bin\libcurl.dll" implib -a "%HB_LIB_INSTALL%\libcurl.lib" "%HB_WITH_CURL%\..\bin\libcurl.dll" + if exist "%HB_WITH_FIREBIRD%\..\lib\fbclient_bor.lib" copy /b /y "%HB_WITH_FIREBIRD%\..\lib\fbclient_bor.lib" "%HB_LIB_INSTALL%\fbclient.lib" + if exist "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.dll" implib "%HB_LIB_INSTALL%\FreeImage.lib" "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.dll" + if exist "%HB_WITH_GD%\..\bin\bgd.dll" implib "%HB_LIB_INSTALL%\bgd.lib" "%HB_WITH_GD%\..\bin\bgd.dll" + if exist "%HB_WITH_LIBHARU%\..\libhpdf.dll" implib "%HB_LIB_INSTALL%\libhpdf.lib" "%HB_WITH_LIBHARU%\..\libhpdf.dll" + if exist "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.dll" implib "%HB_LIB_INSTALL%\libhpdf.lib" "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.dll" + if exist "%HB_WITH_MYSQL%\..\bin\libmySQL.dll" implib "%HB_LIB_INSTALL%\libmysql.lib" "%HB_WITH_MYSQL%\..\bin\libmySQL.dll" + if exist "%HB_WITH_OPENSSL%\..\out32dll\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_WITH_OPENSSL%\..\out32dll\libeay32.dll" + if exist "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.dll" + if exist "%HB_WITH_OPENSSL%\..\dll\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_WITH_OPENSSL%\..\dll\libeay32.dll" + if exist "%HB_WITH_OPENSSL%\..\dll\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_WITH_OPENSSL%\..\dll\ssleay32.dll" + if exist "%HB_WITH_OPENSSL%\..\libeay32.dll" implib -a "%HB_LIB_INSTALL%\libeay32.lib" "%HB_WITH_OPENSSL%\..\libeay32.dll" + if exist "%HB_WITH_OPENSSL%\..\ssleay32.dll" implib -a "%HB_LIB_INSTALL%\ssleay32.lib" "%HB_WITH_OPENSSL%\..\ssleay32.dll" + if exist "%HB_WITH_PGSQL%\..\lib\libpq.dll" implib -a "%HB_LIB_INSTALL%\libpq.lib" "%HB_WITH_PGSQL%\..\lib\libpq.dll" goto END ) if "%HB_COMPILER%" == "msvc" ( - if exist "%HB_DIR_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_DIR_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" - if exist "%HB_DIR_ADS%\ace32.lib" copy /b /y "%HB_DIR_ADS%\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" - if exist "%HB_DIR_ADS%\32bit\ace32.lib" copy /b /y "%HB_DIR_ADS%\32bit\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" - if exist "%HB_DIR_ALLEGRO%\lib\alleg.lib" copy /b /y "%HB_DIR_ALLEGRO%\lib\alleg.lib" "%HB_LIB_INSTALL%\alleg.lib" - if exist "%HB_DIR_APOLLO%\sde61.dll" call :P_MSVC_IMPLIB x86 "%HB_DIR_APOLLO%\sde61.dll" "%HB_LIB_INSTALL%\sde61.lib" - if exist "%HB_DIR_BLAT%\full\blat.lib" copy /b /y "%HB_DIR_BLAT%\full\blat.lib" "%HB_LIB_INSTALL%\blat.lib" - if exist "%HB_DIR_CURL%\libcurl.dll" call :P_MSVC_IMPLIB x86 "%HB_DIR_CURL%\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" - if exist "%HB_DIR_CURL%\bin\libcurl.dll" call :P_MSVC_IMPLIB x86 "%HB_DIR_CURL%\bin\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" - if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\fbclient.lib" - if exist "%HB_DIR_FREEIMAGE%\Dist\FreeImage.lib" copy /b /y "%HB_DIR_FREEIMAGE%\Dist\FreeImage.lib" "%HB_LIB_INSTALL%\FreeImage.lib" - if exist "%HB_DIR_GD%\lib\bgd.lib" copy /b /y "%HB_DIR_GD%\lib\bgd.lib" "%HB_LIB_INSTALL%\bgd.lib" - if exist "%HB_DIR_LIBHARU%\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib" - if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib" - if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib" - if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" - if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" - if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" - if exist "%HB_DIR_OPENSSL%\dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" - if exist "%HB_DIR_OPENSSL%\lib\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" - if exist "%HB_DIR_OPENSSL%\lib\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" - if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" - if exist "%HB_DIR_OPENSSL%\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" - if exist "%HB_DIR_PGSQL%\bin\libpq.dll" call :P_MSVC_IMPLIB x86 "%HB_DIR_PGSQL%\bin\libpq.dll" "%HB_LIB_INSTALL%\libpq.lib" - if exist "%HB_DIR_PGSQL%\lib\libpq.lib" copy /b /y "%HB_DIR_PGSQL%\lib\libpq.lib" "%HB_LIB_INSTALL%\libpq.lib" + if exist "%HB_WITH_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_WITH_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" + if exist "%HB_WITH_ADS%\ace32.lib" copy /b /y "%HB_WITH_ADS%\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" + if exist "%HB_WITH_ADS%\32bit\ace32.lib" copy /b /y "%HB_WITH_ADS%\32bit\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" + if exist "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" copy /b /y "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" "%HB_LIB_INSTALL%\alleg.lib" + if exist "%HB_WITH_APOLLO%\..\sde61.dll" call :P_MSVC_IMPLIB x86 "%HB_WITH_APOLLO%\..\sde61.dll" "%HB_LIB_INSTALL%\sde61.lib" + if exist "%HB_WITH_BLAT%\..\blat.lib" copy /b /y "%HB_WITH_BLAT%\..\blat.lib" "%HB_LIB_INSTALL%\blat.lib" + if exist "%HB_WITH_CURL%\..\libcurl.dll" call :P_MSVC_IMPLIB x86 "%HB_WITH_CURL%\..\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" + if exist "%HB_WITH_CURL%\..\bin\libcurl.dll" call :P_MSVC_IMPLIB x86 "%HB_WITH_CURL%\..\bin\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" + if exist "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" copy /b /y "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\fbclient.lib" + if exist "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.lib" copy /b /y "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.lib" "%HB_LIB_INSTALL%\FreeImage.lib" + if exist "%HB_WITH_GD%\..\lib\bgd.lib" copy /b /y "%HB_WITH_GD%\..\lib\bgd.lib" "%HB_LIB_INSTALL%\bgd.lib" + if exist "%HB_WITH_LIBHARU%\..\libhpdf.lib" copy /b /y "%HB_WITH_LIBHARU%\..\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib" + if exist "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.lib" copy /b /y "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib" + if exist "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" copy /b /y "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib" + if exist "%HB_WITH_OPENSSL%\..\out32dll\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" + if exist "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" + if exist "%HB_WITH_OPENSSL%\..\dll\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" + if exist "%HB_WITH_OPENSSL%\..\dll\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" + if exist "%HB_WITH_OPENSSL%\..\lib\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\lib\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" + if exist "%HB_WITH_OPENSSL%\..\lib\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\lib\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" + if exist "%HB_WITH_OPENSSL%\..\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" + if exist "%HB_WITH_OPENSSL%\..\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" + if exist "%HB_WITH_PGSQL%\..\bin\libpq.dll" call :P_MSVC_IMPLIB x86 "%HB_WITH_PGSQL%\..\bin\libpq.dll" "%HB_LIB_INSTALL%\libpq.lib" + if exist "%HB_WITH_PGSQL%\..\lib\libpq.lib" copy /b /y "%HB_WITH_PGSQL%\..\lib\libpq.lib" "%HB_LIB_INSTALL%\libpq.lib" goto END ) if "%HB_COMPILER%" == "msvc64" ( - if exist "%HB_DIR_CURL%\libcurl.dll" call :P_MSVC_IMPLIB x64 "%HB_DIR_CURL%\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" - if exist "%HB_DIR_CURL%\bin\libcurl.dll" call :P_MSVC_IMPLIB x64 "%HB_DIR_CURL%\bin\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" - if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\fbclient.lib" - if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib" + if exist "%HB_WITH_CURL%\..\libcurl.dll" call :P_MSVC_IMPLIB x64 "%HB_WITH_CURL%\..\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" + if exist "%HB_WITH_CURL%\..\bin\libcurl.dll" call :P_MSVC_IMPLIB x64 "%HB_WITH_CURL%\..\bin\libcurl.dll" "%HB_LIB_INSTALL%\libcurl.lib" + if exist "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" copy /b /y "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\fbclient.lib" + if exist "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" copy /b /y "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib" goto END ) if "%HB_COMPILER%" == "mingw" ( - if exist "%HB_DIR_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_DIR_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\libace32.a" - if exist "%HB_DIR_ADS%\ace32.lib" copy /b /y "%HB_DIR_ADS%\ace32.lib" "%HB_LIB_INSTALL%\libace32.a" - if exist "%HB_DIR_ADS%\32bit\ace32.lib" copy /b /y "%HB_DIR_ADS%\32bit\ace32.lib" "%HB_LIB_INSTALL%\libace32.a" - if exist "%HB_DIR_ALLEGRO%\lib\alleg.lib" copy /b /y "%HB_DIR_ALLEGRO%\lib\alleg.lib" "%HB_LIB_INSTALL%\liballeg.a" - if exist "%HB_DIR_BLAT%\full\blat.lib" copy /b /y "%HB_DIR_BLAT%\full\blat.lib" "%HB_LIB_INSTALL%\libblat.a" - if exist "%HB_DIR_CURL%\lib\libcurl.a" copy /b /y "%HB_DIR_CURL%\lib\libcurl.a" "%HB_LIB_INSTALL%\libcurl.a" - if exist "%HB_DIR_CURL%\lib\libcurldll.a" copy /b /y "%HB_DIR_CURL%\lib\libcurldll.a" "%HB_LIB_INSTALL%\libcurldll.a" - if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\libfbclient.a" - if exist "%HB_DIR_FREEIMAGE%\Dist\FreeImage.lib" copy /b /y "%HB_DIR_FREEIMAGE%\Dist\FreeImage.lib" "%HB_LIB_INSTALL%\libFreeImage.a" - if exist "%HB_DIR_GD%\lib\bgd.lib" copy /b /y "%HB_DIR_GD%\lib\bgd.lib" "%HB_LIB_INSTALL%\libbgd.a" - if exist "%HB_DIR_LIBHARU%\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\libhpdf.lib" "%HB_LIB_INSTALL%\liblibhpdf.a" - if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\liblibhpdf.a" - if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\liblibmysql.a" - if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a" - if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a" - if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a" - if exist "%HB_DIR_OPENSSL%\dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a" - if exist "%HB_DIR_OPENSSL%\lib\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a" - if exist "%HB_DIR_OPENSSL%\lib\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a" - if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a" - if exist "%HB_DIR_OPENSSL%\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a" - if exist "%HB_DIR_PGSQL%\lib\libpq.lib" copy /b /y "%HB_DIR_PGSQL%\lib\libpq.lib" "%HB_LIB_INSTALL%\liblibpq.a" - if exist "%HB_DIR_QT%\lib\libQtCore4.a" copy /b /y "%HB_DIR_QT%\lib\libQtCore4.a" "%HB_LIB_INSTALL%\libQtCore4.a" - if exist "%HB_DIR_QT%\lib\libQtGui4.a" copy /b /y "%HB_DIR_QT%\lib\libQtGui4.a" "%HB_LIB_INSTALL%\libQtGui4.a" - if exist "%HB_DIR_QT%\lib\libQtNetwork4.a" copy /b /y "%HB_DIR_QT%\lib\libQtNetwork4.a" "%HB_LIB_INSTALL%\libQtNetwork4.a" - if exist "%HB_DIR_QT%\lib\libQtWebKit4.a" copy /b /y "%HB_DIR_QT%\lib\libQtWebKit4.a" "%HB_LIB_INSTALL%\libQtWebKit4.a" + if exist "%HB_WITH_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_WITH_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\libace32.a" + if exist "%HB_WITH_ADS%\ace32.lib" copy /b /y "%HB_WITH_ADS%\ace32.lib" "%HB_LIB_INSTALL%\libace32.a" + if exist "%HB_WITH_ADS%\32bit\ace32.lib" copy /b /y "%HB_WITH_ADS%\32bit\ace32.lib" "%HB_LIB_INSTALL%\libace32.a" + if exist "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" copy /b /y "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" "%HB_LIB_INSTALL%\liballeg.a" + if exist "%HB_WITH_BLAT%\..\blat.lib" copy /b /y "%HB_WITH_BLAT%\..\blat.lib" "%HB_LIB_INSTALL%\libblat.a" + if exist "%HB_WITH_CURL%\..\lib\libcurl.a" copy /b /y "%HB_WITH_CURL%\..\lib\libcurl.a" "%HB_LIB_INSTALL%\libcurl.a" + if exist "%HB_WITH_CURL%\..\lib\libcurldll.a" copy /b /y "%HB_WITH_CURL%\..\lib\libcurldll.a" "%HB_LIB_INSTALL%\libcurldll.a" + if exist "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" copy /b /y "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\libfbclient.a" + if exist "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.lib" copy /b /y "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.lib" "%HB_LIB_INSTALL%\libFreeImage.a" + if exist "%HB_WITH_GD%\..\lib\bgd.lib" copy /b /y "%HB_WITH_GD%\..\lib\bgd.lib" "%HB_LIB_INSTALL%\libbgd.a" + if exist "%HB_WITH_LIBHARU%\..\libhpdf.lib" copy /b /y "%HB_WITH_LIBHARU%\..\libhpdf.lib" "%HB_LIB_INSTALL%\liblibhpdf.a" + if exist "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.lib" copy /b /y "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\liblibhpdf.a" + if exist "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" copy /b /y "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\liblibmysql.a" + if exist "%HB_WITH_OPENSSL%\..\out32dll\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a" + if exist "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a" + if exist "%HB_WITH_OPENSSL%\..\dll\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\dll\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a" + if exist "%HB_WITH_OPENSSL%\..\dll\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\dll\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a" + if exist "%HB_WITH_OPENSSL%\..\lib\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\lib\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a" + if exist "%HB_WITH_OPENSSL%\..\lib\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\lib\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a" + if exist "%HB_WITH_OPENSSL%\..\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a" + if exist "%HB_WITH_OPENSSL%\..\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a" + if exist "%HB_WITH_PGSQL%\..\lib\libpq.lib" copy /b /y "%HB_WITH_PGSQL%\..\lib\libpq.lib" "%HB_LIB_INSTALL%\liblibpq.a" + if exist "%HB_WITH_QT%\..\lib\libQtCore4.a" copy /b /y "%HB_WITH_QT%\..\lib\libQtCore4.a" "%HB_LIB_INSTALL%\libQtCore4.a" + if exist "%HB_WITH_QT%\..\lib\libQtGui4.a" copy /b /y "%HB_WITH_QT%\..\lib\libQtGui4.a" "%HB_LIB_INSTALL%\libQtGui4.a" + if exist "%HB_WITH_QT%\..\lib\libQtNetwork4.a" copy /b /y "%HB_WITH_QT%\..\lib\libQtNetwork4.a" "%HB_LIB_INSTALL%\libQtNetwork4.a" + if exist "%HB_WITH_QT%\..\lib\libQtWebKit4.a" copy /b /y "%HB_WITH_QT%\..\lib\libQtWebKit4.a" "%HB_LIB_INSTALL%\libQtWebKit4.a" goto END ) if "%HB_COMPILER%" == "mingw64" ( - if exist "%HB_DIR_CURL%\lib\libcurl.a" copy /b /y "%HB_DIR_CURL%\lib\libcurl.a" "%HB_LIB_INSTALL%\libcurl.a" - if exist "%HB_DIR_CURL%\lib\libcurldll.a" copy /b /y "%HB_DIR_CURL%\lib\libcurldll.a" "%HB_LIB_INSTALL%\libcurldll.a" - if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\libfbclient.a" - if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\liblibmysql.a" + if exist "%HB_WITH_CURL%\..\lib\libcurl.a" copy /b /y "%HB_WITH_CURL%\..\lib\libcurl.a" "%HB_LIB_INSTALL%\libcurl.a" + if exist "%HB_WITH_CURL%\..\lib\libcurldll.a" copy /b /y "%HB_WITH_CURL%\..\lib\libcurldll.a" "%HB_LIB_INSTALL%\libcurldll.a" + if exist "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" copy /b /y "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\libfbclient.a" + if exist "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" copy /b /y "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\liblibmysql.a" goto END ) if "%HB_COMPILER%" == "pocc" ( - if exist "%HB_DIR_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_DIR_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" - if exist "%HB_DIR_ADS%\ace32.lib" copy /b /y "%HB_DIR_ADS%\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" - if exist "%HB_DIR_ADS%\32bit\ace32.lib" copy /b /y "%HB_DIR_ADS%\32bit\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" - if exist "%HB_DIR_ALLEGRO%\lib\alleg.lib" copy /b /y "%HB_DIR_ALLEGRO%\lib\alleg.lib" "%HB_LIB_INSTALL%\alleg.lib" - if exist "%HB_DIR_APOLLO%\sde61.dll" polib "%HB_DIR_APOLLO%\sde61.dll" /out:"%HB_LIB_INSTALL%\sde61.lib" - if exist "%HB_DIR_BLAT%\full\blat.lib" copy /b /y "%HB_DIR_BLAT%\full\blat.lib" "%HB_LIB_INSTALL%\blat.lib" - if exist "%HB_DIR_CURL%\libcurl.dll" polib "%HB_DIR_CURL%\libcurl.dll" /out:"%HB_LIB_INSTALL%\libcurl.lib" - if exist "%HB_DIR_CURL%\bin\libcurl.dll" polib "%HB_DIR_CURL%\bin\libcurl.dll" /out:"%HB_LIB_INSTALL%\libcurl.lib" - if exist "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" copy /b /y "%HB_DIR_FIREBIRD%\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\fbclient.lib" - if exist "%HB_DIR_FREEIMAGE%\Dist\FreeImage.lib" copy /b /y "%HB_DIR_FREEIMAGE%\Dist\FreeImage.lib" "%HB_LIB_INSTALL%\FreeImage.lib" - if exist "%HB_DIR_GD%\lib\bgd.lib" copy /b /y "%HB_DIR_GD%\lib\bgd.lib" "%HB_LIB_INSTALL%\bgd.lib" - if exist "%HB_DIR_LIBHARU%\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib" - if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib" - if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib" - if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" - if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" - if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" - if exist "%HB_DIR_OPENSSL%\dll\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" - if exist "%HB_DIR_OPENSSL%\lib\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" - if exist "%HB_DIR_OPENSSL%\lib\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\lib\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" - if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" - if exist "%HB_DIR_OPENSSL%\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" - if exist "%HB_DIR_PGSQL%\lib\libpq.lib" copy /b /y "%HB_DIR_PGSQL%\lib\libpq.lib" "%HB_LIB_INSTALL%\libpq.lib" + if exist "%HB_WITH_ADS%\Redistribute\ace32.lib" copy /b /y "%HB_WITH_ADS%\Redistribute\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" + if exist "%HB_WITH_ADS%\ace32.lib" copy /b /y "%HB_WITH_ADS%\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" + if exist "%HB_WITH_ADS%\32bit\ace32.lib" copy /b /y "%HB_WITH_ADS%\32bit\ace32.lib" "%HB_LIB_INSTALL%\ace32.lib" + if exist "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" copy /b /y "%HB_WITH_ALLEGRO%\..\lib\alleg.lib" "%HB_LIB_INSTALL%\alleg.lib" + if exist "%HB_WITH_APOLLO%\..\sde61.dll" polib "%HB_WITH_APOLLO%\..\sde61.dll" /out:"%HB_LIB_INSTALL%\sde61.lib" + if exist "%HB_WITH_BLAT%\..\blat.lib" copy /b /y "%HB_WITH_BLAT%\..\blat.lib" "%HB_LIB_INSTALL%\blat.lib" + if exist "%HB_WITH_CURL%\..\libcurl.dll" polib "%HB_WITH_CURL%\..\libcurl.dll" /out:"%HB_LIB_INSTALL%\libcurl.lib" + if exist "%HB_WITH_CURL%\..\bin\libcurl.dll" polib "%HB_WITH_CURL%\..\bin\libcurl.dll" /out:"%HB_LIB_INSTALL%\libcurl.lib" + if exist "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" copy /b /y "%HB_WITH_FIREBIRD%\..\lib\fbclient_ms.lib" "%HB_LIB_INSTALL%\fbclient.lib" + if exist "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.lib" copy /b /y "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.lib" "%HB_LIB_INSTALL%\FreeImage.lib" + if exist "%HB_WITH_GD%\..\lib\bgd.lib" copy /b /y "%HB_WITH_GD%\..\lib\bgd.lib" "%HB_LIB_INSTALL%\bgd.lib" + if exist "%HB_WITH_LIBHARU%\..\libhpdf.lib" copy /b /y "%HB_WITH_LIBHARU%\..\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib" + if exist "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.lib" copy /b /y "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.lib" + if exist "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" copy /b /y "%HB_WITH_MYSQL%\..\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.lib" + if exist "%HB_WITH_OPENSSL%\..\out32dll\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" + if exist "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" + if exist "%HB_WITH_OPENSSL%\..\dll\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" + if exist "%HB_WITH_OPENSSL%\..\dll\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\dll\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" + if exist "%HB_WITH_OPENSSL%\..\lib\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\lib\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" + if exist "%HB_WITH_OPENSSL%\..\lib\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\lib\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" + if exist "%HB_WITH_OPENSSL%\..\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.lib" + if exist "%HB_WITH_OPENSSL%\..\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\ssleay32.lib" "%HB_LIB_INSTALL%\ssleay32.lib" + if exist "%HB_WITH_PGSQL%\..\lib\libpq.lib" copy /b /y "%HB_WITH_PGSQL%\..\lib\libpq.lib" "%HB_LIB_INSTALL%\libpq.lib" goto END ) if "%HB_COMPILER%" == "watcom" ( - if exist "%HB_DIR_ADS%\Redistribute\ace32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\Redistribute\ace32.dll" - if exist "%HB_DIR_ADS%\ace32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\ace32.dll" - if exist "%HB_DIR_ADS%\32bit\ace32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ace32.lib" "%HB_DIR_ADS%\32bit\ace32.dll" - if exist "%HB_DIR_ALLEGRO%\bin\alleg42.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\alleg.lib" "%HB_DIR_ALLEGRO%\bin\alleg42.dll" - if exist "%HB_DIR_APOLLO%\sde61.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\sde61.lib" "%HB_DIR_APOLLO%\sde61.dll" - if exist "%HB_DIR_BLAT%\full\blat.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\blat.lib" "%HB_DIR_BLAT%\full\blat.dll" - if exist "%HB_DIR_CURL%\libcurl.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libcurl.lib" "%HB_DIR_CURL%\libcurl.dll" - if exist "%HB_DIR_CURL%\bin\libcurl.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libcurl.lib" "%HB_DIR_CURL%\bin\libcurl.dll" - if exist "%HB_DIR_FIREBIRD%\bin\fbclient.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\fbclient.lib" "%HB_DIR_FIREBIRD%\bin\fbclient.dll" - if exist "%HB_DIR_FREEIMAGE%\Dist\FreeImage.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\FreeImage.lib" "%HB_DIR_FREEIMAGE%\Dist\FreeImage.dll" - if exist "%HB_DIR_GD%\bin\bgd.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\bgd.lib" "%HB_DIR_GD%\bin\bgd.dll" - if exist "%HB_DIR_LIBHARU%\libhpdf.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libhpdf.lib" "%HB_DIR_LIBHARU%\libhpdf.dll" - if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libhpdf.lib" "%HB_DIR_LIBHARU%\lib_dll\libhpdf.dll" - if exist "%HB_DIR_MYSQL%\bin\libmySQL.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libmySQL.lib" "%HB_DIR_MYSQL%\bin\libmySQL.dll" - if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\out32dll\libeay32.dll" - if exist "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\out32dll\ssleay32.dll" - if exist "%HB_DIR_OPENSSL%\dll\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\dll\libeay32.dll" - if exist "%HB_DIR_OPENSSL%\dll\ssleay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\dll\ssleay32.dll" - if exist "%HB_DIR_OPENSSL%\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_DIR_OPENSSL%\libeay32.dll" - if exist "%HB_DIR_OPENSSL%\ssleay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ssleay32.lib" "%HB_DIR_OPENSSL%\ssleay32.dll" - if exist "%HB_DIR_PGSQL%\lib\libpq.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libpq.lib" "%HB_DIR_PGSQL%\lib\libpq.dll" + if exist "%HB_WITH_ADS%\Redistribute\ace32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ace32.lib" "%HB_WITH_ADS%\Redistribute\ace32.dll" + if exist "%HB_WITH_ADS%\ace32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ace32.lib" "%HB_WITH_ADS%\ace32.dll" + if exist "%HB_WITH_ADS%\32bit\ace32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ace32.lib" "%HB_WITH_ADS%\32bit\ace32.dll" + if exist "%HB_WITH_ALLEGRO%\..\bin\alleg42.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\alleg.lib" "%HB_WITH_ALLEGRO%\..\bin\alleg42.dll" + if exist "%HB_WITH_APOLLO%\..\sde61.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\sde61.lib" "%HB_WITH_APOLLO%\..\sde61.dll" + if exist "%HB_WITH_BLAT%\..\blat.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\blat.lib" "%HB_WITH_BLAT%\..\blat.dll" + if exist "%HB_WITH_CURL%\..\libcurl.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libcurl.lib" "%HB_WITH_CURL%\..\libcurl.dll" + if exist "%HB_WITH_CURL%\..\bin\libcurl.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libcurl.lib" "%HB_WITH_CURL%\..\bin\libcurl.dll" + if exist "%HB_WITH_FIREBIRD%\..\bin\fbclient.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\fbclient.lib" "%HB_WITH_FIREBIRD%\..\bin\fbclient.dll" + if exist "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\FreeImage.lib" "%HB_WITH_FREEIMAGE%\..\Dist\FreeImage.dll" + if exist "%HB_WITH_GD%\..\bin\bgd.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\bgd.lib" "%HB_WITH_GD%\..\bin\bgd.dll" + if exist "%HB_WITH_LIBHARU%\..\libhpdf.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libhpdf.lib" "%HB_WITH_LIBHARU%\..\libhpdf.dll" + if exist "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libhpdf.lib" "%HB_WITH_LIBHARU%\..\lib_dll\libhpdf.dll" + if exist "%HB_WITH_MYSQL%\..\bin\libmySQL.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libmySQL.lib" "%HB_WITH_MYSQL%\..\bin\libmySQL.dll" + if exist "%HB_WITH_OPENSSL%\..\out32dll\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_WITH_OPENSSL%\..\out32dll\libeay32.dll" + if exist "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ssleay32.lib" "%HB_WITH_OPENSSL%\..\out32dll\ssleay32.dll" + if exist "%HB_WITH_OPENSSL%\..\dll\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_WITH_OPENSSL%\..\dll\libeay32.dll" + if exist "%HB_WITH_OPENSSL%\..\dll\ssleay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ssleay32.lib" "%HB_WITH_OPENSSL%\..\dll\ssleay32.dll" + if exist "%HB_WITH_OPENSSL%\..\libeay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libeay32.lib" "%HB_WITH_OPENSSL%\..\libeay32.dll" + if exist "%HB_WITH_OPENSSL%\..\ssleay32.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\ssleay32.lib" "%HB_WITH_OPENSSL%\..\ssleay32.dll" + if exist "%HB_WITH_PGSQL%\..\lib\libpq.dll" wlib.exe -q -o="%HB_LIB_INSTALL%\libpq.lib" "%HB_WITH_PGSQL%\..\lib\libpq.dll" goto END ) diff --git a/harbour/config/global.mk b/harbour/config/global.mk index c870379323..d8accf771d 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -253,7 +253,6 @@ ifeq ($(HB_INIT_DONE),) # HB_COMMERCE -> ? # HB_BIN_COMPILE -> HB_BUILD_BIN_DIR # HB_INC_COMPILE -> - (HB_BUILD_INC_DIR) - # HB_DIR_* -> HB_LIBDIR_* ? (only used for implib and a few .hbm files) # HB_DLLIBS -> (only used in one location, so it's a local matter) # HB_TOOLS_PREF -> ? # Macros: diff --git a/harbour/contrib/gtqtc/gtqtc.hbc b/harbour/contrib/gtqtc/gtqtc.hbc index 0ca8e38a44..6e393d8d8c 100644 --- a/harbour/contrib/gtqtc/gtqtc.hbc +++ b/harbour/contrib/gtqtc/gtqtc.hbc @@ -2,7 +2,7 @@ # $Id$ # -{allwin}libpaths=${HB_DIR_QT}\lib +{allwin}libpaths=${HB_WITH_QT}\..\lib libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4 {linux}libs=QtCore QtGui QtNetwork QtWebKit diff --git a/harbour/contrib/gtqtc/gtqtcs.hbc b/harbour/contrib/gtqtc/gtqtcs.hbc index 8bf0551847..e1e1a72209 100644 --- a/harbour/contrib/gtqtc/gtqtcs.hbc +++ b/harbour/contrib/gtqtc/gtqtcs.hbc @@ -2,7 +2,7 @@ # $Id$ # -{allwin}libpaths=${HB_DIR_QT}\lib +{allwin}libpaths=${HB_WITH_QT}\..\lib libs=QtCore QtGui QtNetwork QtWebKit {allgcc}libs=supc++ diff --git a/harbour/contrib/hbqt/hbqt.hbc b/harbour/contrib/hbqt/hbqt.hbc index c6b1b8562d..42eb98e1df 100644 --- a/harbour/contrib/hbqt/hbqt.hbc +++ b/harbour/contrib/hbqt/hbqt.hbc @@ -4,7 +4,7 @@ incpaths=. -{allwin}libpaths=${HB_DIR_QT}\lib +{allwin}libpaths=${HB_WITH_QT}\..\lib libs=hbqt libs=hbqtcore hbqtgui hbqtnetwork diff --git a/harbour/contrib/hbqt/hbqts.hbc b/harbour/contrib/hbqt/hbqts.hbc index ce795e83d2..147d8eb090 100644 --- a/harbour/contrib/hbqt/hbqts.hbc +++ b/harbour/contrib/hbqt/hbqts.hbc @@ -4,7 +4,7 @@ incpaths=. -{allwin}libpaths=${HB_DIR_QT}\lib +{allwin}libpaths=${HB_WITH_QT}\..\lib libs=hbqts libs=hbqtcores hbqtguis hbqtnetworks hbqtwebkits diff --git a/harbour/external/pcre/cnv_hb2o.bat b/harbour/external/pcre/cnv_hb2o.bat index 4d596b292f..fe2d1e42b7 100644 --- a/harbour/external/pcre/cnv_hb2o.bat +++ b/harbour/external/pcre/cnv_hb2o.bat @@ -3,7 +3,7 @@ rem rem $Id$ rem -rem Tested with PCRE 7.7 +rem Tested with PCRE 8.0 rem NOTE: Purpose of this script is to take the source files rem in Harbour repo and convert them back to the filenames diff --git a/harbour/external/pcre/cnv_o2hb.bat b/harbour/external/pcre/cnv_o2hb.bat index 7e8a2c50b3..1bc1dac46b 100644 --- a/harbour/external/pcre/cnv_o2hb.bat +++ b/harbour/external/pcre/cnv_o2hb.bat @@ -3,7 +3,7 @@ rem rem $Id$ rem -rem Tested with PCRE 7.7 +rem Tested with PCRE 8.0 rem NOTE: Purpose of this script is to take the original rem files from its source distribution and convert diff --git a/harbour/utils/hbmk2/examples/xhgtk.hbc b/harbour/utils/hbmk2/examples/xhgtk.hbc index 50bfe4cfdb..90487dc3de 100644 --- a/harbour/utils/hbmk2/examples/xhgtk.hbc +++ b/harbour/utils/hbmk2/examples/xhgtk.hbc @@ -12,13 +12,13 @@ libpaths=lib libs=xhgtk -{win}libpaths=${HB_DIR_GTK}/lib -{win}libpaths=${HB_DIR_GLIB}/lib -{win}libpaths=${HB_DIR_PANGO}/lib -{win}libpaths=${HB_DIR_CAIRO}/lib -{win}libpaths=${HB_DIR_ATK}/lib -{win}libpaths=${HB_DIR_PNG}/lib -{win}libpaths=${HB_DIR_GLADE}/lib +{win}libpaths=${HB_WITH_GTK}/../lib +{win}libpaths=${HB_WITH_GLIB}/../lib +{win}libpaths=${HB_WITH_PANGO}/../lib +{win}libpaths=${HB_WITH_CAIRO}/../lib +{win}libpaths=${HB_WITH_ATK}/../lib +{win}libpaths=${HB_WITH_PNG}/../lib +{win}libpaths=${HB_WITH_GLADE}/../lib {win}libs=gtk-win32-2.0. gdk-win32-2.0. atk-1.0. gdk_pixbuf-2.0. pangowin32-1.0. pangocairo-1.0. cairo pangoft2-1.0. pango-1.0. gobject-2.0. gmodule-2.0. glib-2.0. intl {linux|darwin}ldflags="`pkg-config --libs gtk+-2.0 libglade-2.0`"