From f110caef7817737ba9621537453d30684a0ad3f2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 11 Nov 2007 13:52:11 +0000 Subject: [PATCH] 2007-11-11 14:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/rdd_ads/make_b32.bat * contrib/rdd_ads/make_vc.bat * contrib/odbc/make_b32.bat * contrib/odbc/make_vc.bat + Added HB_DLL_DIR for BC too. ! Minor fix for VC: echo -> echo. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/odbc/make_b32.bat | 2 +- harbour/contrib/odbc/make_vc.bat | 4 ++-- harbour/contrib/rdd_ads/make_b32.bat | 3 ++- harbour/contrib/rdd_ads/make_vc.bat | 4 ++-- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 76cbe0938a..693189ec2f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-11 14:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/rdd_ads/make_b32.bat + * contrib/rdd_ads/make_vc.bat + * contrib/odbc/make_b32.bat + * contrib/odbc/make_vc.bat + + Added HB_DLL_DIR for BC too. + ! Minor fix for VC: echo -> echo. + 2007-11-11 14:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/tpopup.prg * source/rtl/ttopbar.prg diff --git a/harbour/contrib/odbc/make_b32.bat b/harbour/contrib/odbc/make_b32.bat index 4e4075767c..f2040aba57 100644 --- a/harbour/contrib/odbc/make_b32.bat +++ b/harbour/contrib/odbc/make_b32.bat @@ -36,7 +36,7 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - implib ..\..\lib\%HB_CC_NAME%\odbc32.lib odbc32.dll + implib ..\..\lib\%HB_CC_NAME%\odbc32.lib %HB_DLL_DIR%\odbc32.dll %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log if errorlevel 1 notepad make_%HB_CC_NAME%.log diff --git a/harbour/contrib/odbc/make_vc.bat b/harbour/contrib/odbc/make_vc.bat index db6f03a3c2..fe32882129 100644 --- a/harbour/contrib/odbc/make_vc.bat +++ b/harbour/contrib/odbc/make_vc.bat @@ -46,8 +46,8 @@ if "%1" == "INSTALL" goto INSTALL echo. }>> _temp.sed echo.}>> _temp.sed DUMPBIN /EXPORTS %HB_DLL_DIR%\odbc32.dll > _dump.tmp - echo LIBRARY %HB_DLL_DIR%\odbc32.dll > _temp.def - echo EXPORTS >> _temp.def + echo.LIBRARY %HB_DLL_DIR%\odbc32.dll > _temp.def + echo.EXPORTS >> _temp.def sed -nf _temp.sed < _dump.tmp >> _temp.def LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\odbc32.lib del _dump.tmp diff --git a/harbour/contrib/rdd_ads/make_b32.bat b/harbour/contrib/rdd_ads/make_b32.bat index 7f4932d9f8..cf98d57ab5 100644 --- a/harbour/contrib/rdd_ads/make_b32.bat +++ b/harbour/contrib/rdd_ads/make_b32.bat @@ -15,6 +15,7 @@ rem set HB_MAKE_PROGRAM= rem set HB_MAKE_FLAGS= rem --------------------------------------------------------------- +if "%HB_DLL_DIR%" == "" set HB_DLL_DIR=%SystemRoot%\system32 if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32 if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe set HB_MAKEFILE=..\mtpl_%HB_CC_NAME%.mak @@ -36,7 +37,7 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - implib ..\..\lib\%HB_CC_NAME%\ace32.lib ace32.dll + implib ..\..\lib\%HB_CC_NAME%\ace32.lib %HB_DLL_DIR%\ace32.dll %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log if errorlevel 1 notepad make_%HB_CC_NAME%.log diff --git a/harbour/contrib/rdd_ads/make_vc.bat b/harbour/contrib/rdd_ads/make_vc.bat index 27d8ed33c7..2d4560ffd0 100644 --- a/harbour/contrib/rdd_ads/make_vc.bat +++ b/harbour/contrib/rdd_ads/make_vc.bat @@ -46,8 +46,8 @@ if "%1" == "INSTALL" goto INSTALL echo. }>> _temp.sed echo.}>> _temp.sed DUMPBIN /EXPORTS %HB_DLL_DIR%\ace32.dll > _dump.tmp - echo LIBRARY %HB_DLL_DIR%\ace32.dll > _temp.def - echo EXPORTS >> _temp.def + echo.LIBRARY %HB_DLL_DIR%\ace32.dll > _temp.def + echo.EXPORTS >> _temp.def sed -nf _temp.sed < _dump.tmp >> _temp.def LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\ace32.lib del _dump.tmp