diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 767fdbeb5f..6aeb17e278 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2011-06-17 19:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * package/winuni/mpkg_win_uni.bat + * package/mpkg_win_nightly.bat + + added unicows implibs for applicable platforms. these are totally free + files accessible from the internet for anyone, for some Win9x users it's + too much though, so I'm adding them to binary distro. + To be tested + 2011-06-17 14:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/xhb/xhb.hbp ! added hbfship to .hbp file too. even though hbfship is included diff --git a/harbour/package/mpkg_win_nightly.bat b/harbour/package/mpkg_win_nightly.bat index e5f0640d1c..27018fa6b9 100644 --- a/harbour/package/mpkg_win_nightly.bat +++ b/harbour/package/mpkg_win_nightly.bat @@ -63,6 +63,7 @@ set HB_DIR_7Z=%_HB_DIR_TOOL% set HB_DIR_UPX=%_HB_DIR_TOOL%upx\ rem set HB_DIR_BCC_IMPLIB=%_HB_DIR_COMP%bcc\Bin\ set HB_DIR_MINGW=%_HB_DIR_COMP%mingw +set HB_DIR_UNICOWS=%_HB_DIR_3RD%unicows\ set HB_WITH_ADS=%_HB_DIR_3RD%ads\acesdk set HB_WITH_ALLEGRO=%_HB_DIR_3RD%allegro\include diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 78e3e671a1..0134f70d19 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -9,7 +9,7 @@ rem Copyright 2009-2010 Viktor Szakats (harbour.01 syenar.hu) rem See COPYING for licensing terms. rem --------------------------------------------------------------- -rem - Adjust target dir, mingw dirs, set HB_DIR_UPX, HB_DIR_7Z, HB_DIR_MINGW, +rem - Adjust target dir, mingw dirs, set HB_DIR_UPX, HB_DIR_7Z, HB_DIR_MINGW, HB_DIR_UNICOWS, rem create required packages beforehand. rem - Requires BCC in PATH or HB_DIR_BCC_IMPLIB (for implib). rem - Run this from vanilla official source tree only. @@ -89,6 +89,13 @@ xcopy /y "%HB_WITH_QT%\..\lib\libQtSql4.a" copy /y "%HB_WITH_QT%\..\LICENSE.LGPL" %HB_ABSROOT%bin\Qt_LICENSE_LGPL.txt copy /y "%HB_WITH_QT%\..\LGPL_EXCEPTION.txt" %HB_ABSROOT%bin\Qt_LICENSE_LGPL_EXCEPTION.txt +if exist %HB_ABSROOT%lib\win\mingw\ xcopy /y "%HB_DIR_UNICOWS%\mingw\libunicows.a" %HB_ABSROOT%lib\win\mingw\ +if exist %HB_ABSROOT%lib\win\mingw\ xcopy /y "%HB_DIR_UNICOWS%\mingw\unicows_license.txt" %HB_ABSROOT%lib\win\mingw\ +if exist %HB_ABSROOT%lib\win\watcom\ xcopy /y "%HB_DIR_UNICOWS%\watcom\unicows.lib" %HB_ABSROOT%lib\win\watcom\ +if exist %HB_ABSROOT%lib\win\watcom\ xcopy /y "%HB_DIR_UNICOWS%\watcom\unicows_license.txt" %HB_ABSROOT%lib\win\watcom\ +if exist %HB_ABSROOT%lib\win\bcc\ xcopy /y "%HB_DIR_UNICOWS%\bcc\unicows.lib" %HB_ABSROOT%lib\win\bcc\ +if exist %HB_ABSROOT%lib\win\bcc\ xcopy /y "%HB_DIR_UNICOWS%\bcc\unicows_license.txt" %HB_ABSROOT%lib\win\bcc\ + pushd cd %~dp0..\..\contrib