From c61e0f1f830de21c13bf81925e12b4f7a8a48ef5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 3 Mar 2011 23:12:44 +0000 Subject: [PATCH] 2011-03-04 00:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmzip/3rd/minizip/minizip.dif * contrib/hbmzip/3rd/minizip/ioapi.h ! Fixed for cygwin. [Tamas Tevesz] * contrib/hblzf/3rd/liblzf/lzfP.h * contrib/hblzf/3rd/liblzf/liblzf.dif ! Fixed for bcc. [Tamas Tevesz] * utils/hbmk2/hbmk2.prg ! Fixed to include hbmainstd after converting cygwin from compiler to platform. ; QUESTION: should we use hbmainwin for cygwin apps in -gui mode? --- harbour/ChangeLog | 14 ++++++ harbour/contrib/hblzf/3rd/liblzf/liblzf.dif | 16 +++++- harbour/contrib/hblzf/3rd/liblzf/lzfP.h | 2 +- harbour/contrib/hbmzip/3rd/minizip/ioapi.h | 1 + .../contrib/hbmzip/3rd/minizip/minizip.dif | 49 ++++++++++--------- harbour/utils/hbmk2/hbmk2.prg | 3 ++ 6 files changed, 59 insertions(+), 26 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9f2438b5a3..3f93f243c9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,20 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-04 00:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbmzip/3rd/minizip/minizip.dif + * contrib/hbmzip/3rd/minizip/ioapi.h + ! Fixed for cygwin. [Tamas Tevesz] + + * contrib/hblzf/3rd/liblzf/lzfP.h + * contrib/hblzf/3rd/liblzf/liblzf.dif + ! Fixed for bcc. [Tamas Tevesz] + + * utils/hbmk2/hbmk2.prg + ! Fixed to include hbmainstd after converting cygwin from + compiler to platform. + ; QUESTION: should we use hbmainwin for cygwin apps in -gui mode? + 2011-03-03 14:50 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbnetio/utils/hbnetioq/netiosrq.prg * contrib/hbqt/qtuitools/THbQtUILoader.prg diff --git a/harbour/contrib/hblzf/3rd/liblzf/liblzf.dif b/harbour/contrib/hblzf/3rd/liblzf/liblzf.dif index d7783cffb8..9118431406 100644 --- a/harbour/contrib/hblzf/3rd/liblzf/liblzf.dif +++ b/harbour/contrib/hblzf/3rd/liblzf/liblzf.dif @@ -1,6 +1,6 @@ diff -urN liblzf.orig/lzf.h liblzf/lzf.h ---- liblzf.orig/lzf.h 2011-03-01 17:34:48.870928894 +0100 -+++ liblzf/lzf.h 2011-03-01 17:34:48.910930654 +0100 +--- liblzf.orig/lzf.h 2011-03-03 16:32:45.540929609 +0100 ++++ liblzf/lzf.h 2011-03-03 16:32:45.570926090 +0100 @@ -37,6 +37,10 @@ #ifndef LZF_H #define LZF_H @@ -22,3 +22,15 @@ diff -urN liblzf.orig/lzf.h liblzf/lzf.h + #endif +diff -urN liblzf.orig/lzfP.h liblzf/lzfP.h +--- liblzf.orig/lzfP.h 2011-03-03 16:32:45.590925701 +0100 ++++ liblzf/lzfP.h 2011-03-03 16:32:45.590925701 +0100 +@@ -141,7 +141,7 @@ + #endif + + #ifndef LZF_USE_OFFSETS +-# if defined (WIN32) ++# if defined (WIN32) || defined(_WIN32) + # define LZF_USE_OFFSETS defined(_M_X64) + # else + # if __cplusplus > 199711L diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzfP.h b/harbour/contrib/hblzf/3rd/liblzf/lzfP.h index 7b7feda477..97c56b2c88 100644 --- a/harbour/contrib/hblzf/3rd/liblzf/lzfP.h +++ b/harbour/contrib/hblzf/3rd/liblzf/lzfP.h @@ -141,7 +141,7 @@ using namespace std; #endif #ifndef LZF_USE_OFFSETS -# if defined (WIN32) +# if defined (WIN32) || defined(_WIN32) # define LZF_USE_OFFSETS defined(_M_X64) # else # if __cplusplus > 199711L diff --git a/harbour/contrib/hbmzip/3rd/minizip/ioapi.h b/harbour/contrib/hbmzip/3rd/minizip/ioapi.h index f887a6d19c..9b38b97243 100644 --- a/harbour/contrib/hbmzip/3rd/minizip/ioapi.h +++ b/harbour/contrib/hbmzip/3rd/minizip/ioapi.h @@ -67,6 +67,7 @@ defined( HB_OS_HAIKU ) || \ defined( HB_OS_DOS ) || \ defined( HB_OS_OS2 ) || \ +    defined( HB_OS_CYGWIN ) || \ defined( HB_OS_MINIX ) # define USE_FILE32API #endif diff --git a/harbour/contrib/hbmzip/3rd/minizip/minizip.dif b/harbour/contrib/hbmzip/3rd/minizip/minizip.dif index b890a23ddc..5318a5e192 100644 --- a/harbour/contrib/hbmzip/3rd/minizip/minizip.dif +++ b/harbour/contrib/hbmzip/3rd/minizip/minizip.dif @@ -1,6 +1,6 @@ -diff -urN minizip.orig\crypt.h minizip\crypt.h ---- minizip.orig\crypt.h Sat Feb 12 23:42:50 2011 -+++ minizip\crypt.h Sat Feb 12 23:42:50 2011 +diff -urN minizip.orig/crypt.h minizip/crypt.h +--- minizip.orig/crypt.h 2011-03-03 21:33:00.020930338 +0100 ++++ minizip/crypt.h 2011-03-03 21:33:00.020930338 +0100 @@ -38,6 +38,8 @@ * unpredictable manner on 16-bit systems; not a problem * with any known compiler so far, though */ @@ -10,9 +10,9 @@ diff -urN minizip.orig\crypt.h minizip\crypt.h temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); } -diff -urN minizip.orig\ioapi.c minizip\ioapi.c ---- minizip.orig\ioapi.c Sat Feb 12 23:42:50 2011 -+++ minizip\ioapi.c Sat Feb 12 23:42:50 2011 +diff -urN minizip.orig/ioapi.c minizip/ioapi.c +--- minizip.orig/ioapi.c 2011-03-03 21:33:00.020930338 +0100 ++++ minizip/ioapi.c 2011-03-03 21:33:00.020930338 +0100 @@ -15,6 +15,7 @@ #endif @@ -142,19 +142,15 @@ diff -urN minizip.orig\ioapi.c minizip\ioapi.c { pzlib_filefunc_def->zopen_file = fopen_file_func; pzlib_filefunc_def->zread_file = fread_file_func; -diff -urN minizip.orig\ioapi.h minizip\ioapi.h ---- minizip.orig\ioapi.h Sat Feb 12 23:42:50 2011 -+++ minizip\ioapi.h Sat Feb 12 23:42:50 2011 -@@ -21,28 +21,55 @@ +diff -urN minizip.orig/ioapi.h minizip/ioapi.h +--- minizip.orig/ioapi.h 2011-03-03 21:33:00.030928894 +0100 ++++ minizip/ioapi.h 2011-03-03 21:33:00.030928894 +0100 +@@ -21,29 +21,57 @@ #ifndef _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H -#if (!defined(_WIN32)) && (!defined(WIN32)) -+#if !(defined(_WIN32) || defined(WIN32)) && \ -+ !(defined(__MSDOS__) || defined(MSDOS)) && \ -+ !(defined(OS_2) || defined(__OS2__) || defined(OS2)) && \ -+ !defined(__WATCOMC__) - +- - // Linux needs this to support file operation on files larger then 4+GB - // But might need better if/def to select just the platforms that needs them. - @@ -170,6 +166,11 @@ diff -urN minizip.orig\ioapi.h minizip\ioapi.h - #ifndef _FILE_OFFSET_BIT - #define _FILE_OFFSET_BIT 64 - #endif ++#if !(defined(_WIN32) || defined(WIN32)) && \ ++ !(defined(__MSDOS__) || defined(MSDOS)) && \ ++ !(defined(OS_2) || defined(__OS2__) || defined(OS2)) && \ ++ !defined(__WATCOMC__) ++ + /* Linux needs this to support file operation on files larger then 4+GB + * on 32bit platforms + * But might need better if/def to select just the platforms that needs them. @@ -188,7 +189,7 @@ diff -urN minizip.orig\ioapi.h minizip\ioapi.h #include #include #include "zlib.h" -+ + +#include "hbsetup.h" + +#if defined( HB_OS_VXWORKS ) && defined( _STD_USING_INT_TYPES ) @@ -211,15 +212,17 @@ diff -urN minizip.orig\ioapi.h minizip\ioapi.h + defined( HB_OS_HAIKU ) || \ + defined( HB_OS_DOS ) || \ + defined( HB_OS_OS2 ) || \ ++ defined( HB_OS_CYGWIN ) || \ + defined( HB_OS_MINIX ) +# define USE_FILE32API +#endif - ++ #if defined(USE_FILE32API) #define fopen64 fopen -diff -urN minizip.orig\unzip.c minizip\unzip.c ---- minizip.orig\unzip.c Sat Feb 12 23:42:50 2011 -+++ minizip\unzip.c Sat Feb 12 23:42:50 2011 + #define ftello64 ftell +diff -urN minizip.orig/unzip.c minizip/unzip.c +--- minizip.orig/unzip.c 2011-03-03 21:33:00.080927820 +0100 ++++ minizip/unzip.c 2011-03-03 21:33:00.080927820 +0100 @@ -68,13 +68,17 @@ #include #include @@ -306,9 +309,9 @@ diff -urN minizip.orig\unzip.c minizip\unzip.c pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc; pfile_in_zip_read_info->crc32=0; -diff -urN minizip.orig\zip.c minizip\zip.c ---- minizip.orig\zip.c Sat Feb 12 23:42:50 2011 -+++ minizip\zip.c Sat Feb 12 23:42:50 2011 +diff -urN minizip.orig/zip.c minizip/zip.c +--- minizip.orig/zip.c 2011-03-03 21:33:00.130927025 +0100 ++++ minizip/zip.c 2011-03-03 21:33:00.130927025 +0100 @@ -29,16 +29,20 @@ #include "zlib.h" #include "zip.h" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 3c0257db96..8d31171a80 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3523,6 +3523,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF hbmk[ _HBMK_cPLAT ] == "cygwin" l_aLIBSHAREDPOST := { "hbmainstd" } l_aLIBSHARED := { cHarbourDyn + cDL_Version_Alter + hbmk_DYNSUFFIX( hbmk ) } + IF ! l_lNOHBLIB .AND. ! hbmk[ _HBMK_lCreateDyn ] + l_aLIBSTATICPOST := l_aLIBSHAREDPOST + ENDIF ENDIF CASE ( hbmk[ _HBMK_cPLAT ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ;