diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6eba75fcfa..e2d5b43e13 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,11 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-07-11 23:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * package/winuni/mpkg_win_uni.bat + * changed to copy mingw dlls from mingw rather than from QT + to be in sync with embedded mingw files + 2011-07-10 22:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * examples/gtwvw/tests/wvwtest9.prg ! fixed bad code: inkey()!=Chr(0) -> inkey()!=0 - (perfect example why certain "extensions" are not a good idea + (perfect example why certain "extensions" are not a good idea from a technical standpoint.) 2011-07-08 15:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) @@ -49,7 +54,7 @@ to solve MT problems reported by Marek. Many thanks to Vincent Rogier (author of OCILIB) for the tip and advice. - Please retest now. + Please retest now. [TESTED OK] 2011-07-06 00:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/gtwin/gtwin.c diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 4719684d6d..9a528d1f81 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -74,8 +74,9 @@ xcopy /y "%HB_DIR_UPX%upx.exe" xcopy /y /s /e "%HB_DIR_MINGW%" %HB_ABSROOT%comp\mingw\ rem del %HB_ABSROOT%comp\mingw\tdm-mingw-1.908.0-4.4.1-2.exe -xcopy /y "%HB_WITH_QT%\..\bin\libgcc_s_dw2-1.dll" %HB_ABSROOT%bin\ -xcopy /y "%HB_WITH_QT%\..\bin\mingwm10.dll" %HB_ABSROOT%bin\ +xcopy /y "%HB_DIR_MINGW%\bin\libgcc_s_dw2-1.dll" %HB_ABSROOT%bin\ +xcopy /y "%HB_DIR_MINGW%\bin\mingwm10.dll" %HB_ABSROOT%bin\ + xcopy /y "%HB_WITH_QT%\..\bin\QtCore4.dll" %HB_ABSROOT%bin\ xcopy /y "%HB_WITH_QT%\..\bin\QtGui4.dll" %HB_ABSROOT%bin\ xcopy /y "%HB_WITH_QT%\..\bin\QtNetwork4.dll" %HB_ABSROOT%bin\