From fa73ab792a20ef64598e70345a23a161566efbdd Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 24 Apr 2009 11:45:55 +0000 Subject: [PATCH] 2009-04-24 13:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * bin/postinst.bat + Added support for HB_BUILD_IMPLIB for mingw. (only when using Windows shell to build it, which is now the preferred method.) ace32 implib method was applied to most other libs, too. I didn't test it, it may need further tweaks. I'll tweak it gradually, with hbmk2 it is probably better to use implibs from native locations where possible (like we do for QT on all platforms and like we do for all non-Win platforms), so even other compilers may get further changes. --- harbour/ChangeLog | 12 ++++++++++++ harbour/bin/postinst.bat | 26 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index df1830f832..f05d0bd99a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-24 13:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * bin/postinst.bat + + Added support for HB_BUILD_IMPLIB for mingw. + (only when using Windows shell to build it, which is now the + preferred method.) + ace32 implib method was applied to most other libs, too. I didn't + test it, it may need further tweaks. I'll tweak it gradually, with + hbmk2 it is probably better to use implibs from native locations + where possible (like we do for QT on all platforms and like we do + for all non-Win platforms), so even other compilers may get + further changes. + 2009-04-24 13:18 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * INSTALL * Changed QT examples according to 4.5.1 new default dir layout. diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 3e3d757b4e..52b288eb97 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -107,6 +107,32 @@ if "%HB_BUILD_IMPLIB%" == "yes" ( 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%\libhpdf.a" + if exist "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" copy /b /y "%HB_DIR_LIBHARU%\lib_dll\libhpdf.lib" "%HB_LIB_INSTALL%\libhpdf.a" + if exist "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" copy /b /y "%HB_DIR_MYSQL%\lib\opt\libmySQL.lib" "%HB_LIB_INSTALL%\libmySQL.a" + if exist "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\out32dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.a" + if exist "%HB_DIR_OPENSSL%\dll\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.a" + if exist "%HB_DIR_OPENSSL%\libeay32.lib" copy /b /y "%HB_DIR_OPENSSL%\libeay32.lib" "%HB_LIB_INSTALL%\libeay32.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\ssleay32.lib" copy /b /y "%HB_DIR_OPENSSL%\dll\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.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%\libpq.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"