From 082a98114da53fbcef36f0ab3294f366631b3ee0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 9 Jul 2008 08:21:20 +0000 Subject: [PATCH] 2008-07-09 10:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/make_b32_all.bat * contrib/make_vc_all.bat ! Fixed to accept HB_INC_* envvars to specify header locations for external packages. --- harbour/ChangeLog | 6 ++++++ harbour/contrib/make_b32_all.bat | 18 +++++++++--------- harbour/contrib/make_vc_all.bat | 18 +++++++++--------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 817f7881e4..c14832c826 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-09 10:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/make_b32_all.bat + * contrib/make_vc_all.bat + ! Fixed to accept HB_INC_* envvars to specify + header locations for external packages. + 2008-07-09 10:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/gtwvt/gtwvt.c * contrib/gtwvg/gtwvg.c diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index 893532bdf4..07434b6329 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -49,15 +49,15 @@ set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbw32ddr hbwhat32 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbziparch rddado xhb -if not "%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo -if not "%HB_DIR_CURL%" == "" set _HB_DIRS=%_HB_DIRS% hbcurl -if not "%HB_DIR_FIREBIRD%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird -if not "%HB_DIR_FREEIMAGE%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage -if not "%HB_DIR_GD%" == "" set _HB_DIRS=%_HB_DIRS% hbgd -if not "%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf -if not "%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql -if not "%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql -if not "%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads +if not "%HB_INC_APOLLO%%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo +if not "%HB_INC_CURL%%HB_DIR_CURL%" == "" set _HB_DIRS=%_HB_DIRS% hbcurl +if not "%HB_INC_FIREBIRD%%HB_DIR_FIREBIRD%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird +if not "%HB_INC_FREEIMAGE%%HB_DIR_FREEIMAGE%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage +if not "%HB_INC_GD%%HB_DIR_GD%" == "" set _HB_DIRS=%_HB_DIRS% hbgd +if not "%HB_INC_LIBHARU%%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf +if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql +if not "%HB_INC_PGSQL%%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql +if not "%HB_INC_ADS%%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 rem ******************************************************* diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index 8af3edd991..a0d595ad1c 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -49,15 +49,15 @@ set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbw32ddr hbwhat32 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=hbziparch rddado xhb -if not "%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo -if not "%HB_DIR_CURL%" == "" set _HB_DIRS=%_HB_DIRS% hbcurl -if not "%HB_DIR_FIREBIRD%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird -if not "%HB_DIR_FREEIMAGE%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage -if not "%HB_DIR_GD%" == "" set _HB_DIRS=%_HB_DIRS% hbgd -if not "%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf -if not "%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql -if not "%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql -if not "%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads +if not "%HB_INC_APOLLO%%HB_DIR_APOLLO%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo +if not "%HB_INC_CURL%%HB_DIR_CURL%" == "" set _HB_DIRS=%_HB_DIRS% hbcurl +if not "%HB_INC_FIREBIRD%%HB_DIR_FIREBIRD%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird +if not "%HB_INC_FREEIMAGE%%HB_DIR_FREEIMAGE%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage +if not "%HB_INC_GD%%HB_DIR_GD%" == "" set _HB_DIRS=%_HB_DIRS% hbgd +if not "%HB_INC_LIBHARU%%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf +if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql +if not "%HB_INC_PGSQL%%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql +if not "%HB_INC_ADS%%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 rem *******************************************************