2008-09-07 01:44 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

* contrib/hbcurl/make_vc.bat
     ! Fixed external .lib handling for MSVC.

   * contrib/rddads/make_vc.bat
     ! Fixed external .lib handling for MSVC 
       (for older ACE versions).

   * contrib/hbhpdf/make_b32.bat
   * contrib/hbhpdf/make_vc.bat
     + Added .lib/.dll support for libharu 2.1.0 
       binary distribution version.
This commit is contained in:
Viktor Szakats
2008-09-06 23:45:17 +00:00
parent fe2d52337b
commit 19ee99fb0f
5 changed files with 40 additions and 6 deletions

View File

@@ -8,6 +8,19 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-09-07 01:44 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbcurl/make_vc.bat
! Fixed external .lib handling for MSVC.
* contrib/rddads/make_vc.bat
! Fixed external .lib handling for MSVC
(for older ACE versions).
* contrib/hbhpdf/make_b32.bat
* contrib/hbhpdf/make_vc.bat
+ Added .lib/.dll support for libharu 2.1.0
binary distribution version.
2008-09-06 12:38 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* source/hbpcre/pcre.h
* source/hbpcre/config.h

View File

@@ -47,8 +47,23 @@ if "%1" == "INSTALL" goto POST_INSTALL
:POST_BUILD
rem Use supplied .lib file.
if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_CURL%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
rem ---------------------------------------------------------------
rem This .dll to .lib conversion needs GNU sed.exe in the path
rem ---------------------------------------------------------------
echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed
echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed
echo. s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _temp.sed
echo. }>> _temp.sed
echo.}>> _temp.sed
DUMPBIN /EXPORTS "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" > _dump.tmp
echo.LIBRARY "%_HB_DLL_DIR%\%_HB_DLL_NAME%.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%\%_HB_DLL_NAME%.lib >> %_HB_MAKELOG%
del _dump.tmp
del _temp.def
del _temp.sed
rem ---------------------------------------------------------------
goto POST_EXIT
:POST_CLEAN

View File

@@ -21,7 +21,10 @@ goto POST_EXIT
if "%HB_INC_LIBHARU%" == "" set HB_INC_LIBHARU=%HB_DIR_LIBHARU%\include
set CFLAGS=-I"%HB_INC_LIBHARU%"
set _HB_DLL_NAME=libhpdf
set _HB_DLL_DIR=%HB_DIR_LIBHARU%
if exist "%HB_DIR_LIBHARU%\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_LIBHARU%
if exist "%HB_DIR_LIBHARU%\lib_dll\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_LIBHARU%\lib_dll
if not "%HB_DIR_LIBHARU%" == "" echo Using .dll: "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll"
rem ---------------------------------------------------------------

View File

@@ -21,7 +21,10 @@ goto POST_EXIT
if "%HB_INC_LIBHARU%" == "" set HB_INC_LIBHARU=%HB_DIR_LIBHARU%\include
set CFLAGS=-I"%HB_INC_LIBHARU%"
set _HB_DLL_NAME=libhpdf
set _HB_DLL_DIR=%HB_DIR_LIBHARU%
if exist "%HB_DIR_LIBHARU%\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_LIBHARU%
if exist "%HB_DIR_LIBHARU%\lib_dll\%_HB_DLL_NAME%.dll" set _HB_DLL_DIR=%HB_DIR_LIBHARU%\lib_dll
if not "%HB_DIR_LIBHARU%" == "" echo Using .dll: "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll"
rem ---------------------------------------------------------------
@@ -46,7 +49,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
:POST_BUILD
rem Use supplied .lib file.
if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_LIBHARU%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%_HB_DLL_DIR%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_CLEAN

View File

@@ -49,7 +49,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
:POST_BUILD
rem Use supplied .lib file.
if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%HB_DIR_ADS%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib copy "%_HB_DLL_DIR%\%_HB_DLL_NAME%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_CLEAN