diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7f75618e31..462154ce26 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-22 18:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/postinst.prg + ! Added hack to workaround the exception where mysql .dll doesn't + work with Harbour if copied to .a file. Instead I copy over the + import .lib to .a as before. If anyone knows a better solution, + pls speak up. + 2010-04-22 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/common/hbtrace.c ! Fixed another typo in recent modifications. diff --git a/harbour/config/postinst.prg b/harbour/config/postinst.prg index 6ddb434d1b..eb9c27b525 100644 --- a/harbour/config/postinst.prg +++ b/harbour/config/postinst.prg @@ -113,10 +113,14 @@ PROCEDURE Main() ENDIF NEXT + /* HACK: Copying .dll to .a doesn't work in case of mysql, so we copy over the supplied import lib. [vszakats] */ + IF GetEnv( "HB_COMPILER" ) $ "mingw|mingw64" + hb_FCopy( GetEnv( "HB_WITH_MYSQL" ) + _PS_ + StrTran( "..\lib\opt\libmySQL.lib", "\", _PS_ ), GetEnv( "HB_LIB_INSTALL" ) + _PS_ + "liblibmysql.a" ) + ENDIF + /* Exception: We use static libs with mingw */ IF GetEnv( "HB_COMPILER" ) == "mingw" .AND. ; ! Empty( GetEnv( "HB_WITH_OCILIB" ) ) - hb_FCopy( GetEnv( "HB_WITH_OCILIB" ) + _PS_ + StrTran( "..\lib32\libociliba.a", "\", _PS_ ), GetEnv( "HB_LIB_INSTALL" ) + _PS_ + "libociliba.a" ) hb_FCopy( GetEnv( "HB_WITH_OCILIB" ) + _PS_ + StrTran( "..\lib32\libocilibm.a", "\", _PS_ ), GetEnv( "HB_LIB_INSTALL" ) + _PS_ + "libocilibm.a" ) hb_FCopy( GetEnv( "HB_WITH_OCILIB" ) + _PS_ + StrTran( "..\lib32\libocilibw.a", "\", _PS_ ), GetEnv( "HB_LIB_INSTALL" ) + _PS_ + "libocilibw.a" )