From 8a34ffb5fcaf050924a27010a39031d7a077dd02 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 3 Aug 2010 07:39:10 +0000 Subject: [PATCH] 2010-08-03 09:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbgtcore.h * include/hbapifs.h * include/hbapi.h + Added HB_EXPORT flag to these functions: (required by xhb, gtwvg and minizip) hb_gt_ItemBase() hb_gt_gcMark() hb_gt_winapi_setClipboard() hb_gt_winapi_getClipboard() hb_gt_winapi_getKbdState() hb_gt_winapi_setKbdState() hb_gt_winapi_tone() hb_fsAttrFromRaw() hb_fsAttrToRaw() hb_fsAttrEncode() hb_fsAttrDecode() hb_fopen() hb_gcCollect() hb_gcCollectAll() ; TOFIX: I didn't want to add these as they look heavily internal (some even marked as such, they are all used by xhb lib: hb_stackBaseOffset() hb_stackItem() hb_stackBaseProcOffset() hb_stackWithObjectOffset() * contrib/gtalleg/gtalleg.hbm ! Fixed missing -a implib flag for bcc. * contrib/hbqt/qscintilla/hbqscintilla.hbc + Added lib dependency name. * contrib/hbide/hbide.prg ! Fix to prev. --- harbour/ChangeLog | 36 +++++++++++++++++++ harbour/contrib/gtalleg/gtalleg.hbm | 2 ++ harbour/contrib/hbide/hbide.prg | 2 -- .../contrib/hbqt/qscintilla/hbqscintilla.hbc | 2 +- harbour/include/hbapi.h | 4 +-- harbour/include/hbapifs.h | 10 +++--- harbour/include/hbgtcore.h | 14 ++++---- 7 files changed, 53 insertions(+), 17 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 05614d418a..0b1ede0253 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,42 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-03 09:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * include/hbgtcore.h + * include/hbapifs.h + * include/hbapi.h + + Added HB_EXPORT flag to these functions: (required by xhb, gtwvg and minizip) + hb_gt_ItemBase() + hb_gt_gcMark() + hb_gt_winapi_setClipboard() + hb_gt_winapi_getClipboard() + hb_gt_winapi_getKbdState() + hb_gt_winapi_setKbdState() + hb_gt_winapi_tone() + hb_fsAttrFromRaw() + hb_fsAttrToRaw() + hb_fsAttrEncode() + hb_fsAttrDecode() + hb_fopen() + hb_gcCollect() + hb_gcCollectAll() + + ; TOFIX: I didn't want to add these as they look heavily internal (some even + marked as such, they are all used by xhb lib: + hb_stackBaseOffset() + hb_stackItem() + hb_stackBaseProcOffset() + hb_stackWithObjectOffset() + + * contrib/gtalleg/gtalleg.hbm + ! Fixed missing -a implib flag for bcc. + + * contrib/hbqt/qscintilla/hbqscintilla.hbc + + Added lib dependency name. + + * contrib/hbide/hbide.prg + ! Fix to prev. + 2010-08-03 09:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Added trick to filter out target lib name from input lib list -hblib diff --git a/harbour/contrib/gtalleg/gtalleg.hbm b/harbour/contrib/gtalleg/gtalleg.hbm index dd40619c88..e2c22c9a6c 100644 --- a/harbour/contrib/gtalleg/gtalleg.hbm +++ b/harbour/contrib/gtalleg/gtalleg.hbm @@ -18,5 +18,7 @@ -depincpath=allegro:/opt/local/include -depimplibs=allegro:../bin/alleg42.dll +-iflag={bcc}-a + gtalleg.c ssf.c diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index c58c9a98e6..dbb1146ebd 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -100,8 +100,6 @@ PROCEDURE Main( ... ) LOCAL oIde LOCAL oResource - hbide_request() - #ifdef HB_IDE_DISTRO LOCAL cBse := hb_dirBase() + ".." diff --git a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc index 127f34c408..e4975037cc 100644 --- a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc +++ b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc @@ -17,7 +17,7 @@ incpaths=g # NOTE: untested {!HB_STATIC_QT&!hbdyn}libs=hbqscintilla${__HB_DYN__} -{!HB_STATIC_QT&(allwin|os2)}libs=qscintilla2 +{!HB_STATIC_QT&(allwin|os2)}libs=qscintilla2 QSci_Qt4 {!HB_STATIC_QT&linux}libs=qscintilla2 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/qscintilla2.framework/qscintilla2 {HB_STATIC_QT&allwin&!hbdyn}libs=hbqscintillas${__HB_DYN__} diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index 83cad4704b..2c5091d3d0 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -612,8 +612,8 @@ extern HB_COUNTER hb_gcRefCount( void * pAlloc ); /* return number of reference #endif #endif /* _HB_API_INTERNAL_ */ -extern void hb_gcCollect( void ); /* checks if a single memory block can be released */ -extern void hb_gcCollectAll( HB_BOOL fForce ); /* checks if all memory blocks can be released */ +extern HB_EXPORT void hb_gcCollect( void ); /* checks if a single memory block can be released */ +extern HB_EXPORT void hb_gcCollectAll( HB_BOOL fForce ); /* checks if all memory blocks can be released */ /* Extend API */ extern HB_EXPORT HB_ULONG hb_parinfo( int iParam ); /* Determine the param count or data type */ diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h index 26cd114fd3..9652ce659d 100644 --- a/harbour/include/hbapifs.h +++ b/harbour/include/hbapifs.h @@ -313,10 +313,10 @@ extern HB_EXPORT int hb_fsProcessValue( HB_FHANDLE hProcess, HB_BOOL fWai extern HB_EXPORT HB_BOOL hb_fsProcessClose( HB_FHANDLE hProcess, HB_BOOL fGentle ); /* Misc helper functions */ -extern HB_FATTR hb_fsAttrFromRaw( HB_FATTR raw_attr ); -extern HB_FATTR hb_fsAttrToRaw( HB_FATTR ulAttr ); -extern HB_FATTR hb_fsAttrEncode( const char * szAttr ); -extern char * hb_fsAttrDecode( HB_FATTR ulAttr, char * szAttr ); +extern HB_EXPORT HB_FATTR hb_fsAttrFromRaw( HB_FATTR raw_attr ); +extern HB_EXPORT HB_FATTR hb_fsAttrToRaw( HB_FATTR ulAttr ); +extern HB_EXPORT HB_FATTR hb_fsAttrEncode( const char * szAttr ); +extern HB_EXPORT char * hb_fsAttrDecode( HB_FATTR ulAttr, char * szAttr ); extern HB_EXPORT HB_BOOL hb_fsMaxFilesError( void ); extern HB_EXPORT const char * hb_fsNameConv( const char * szFileName, char ** pszFree ); @@ -379,7 +379,7 @@ extern HB_EXPORT void hb_fileCommit( PHB_FILE pFile ); extern HB_EXPORT HB_FHANDLE hb_fileHandle( PHB_FILE pFile ); /* wrapper to fopen() which calls hb_fsNameConv() */ -extern FILE * hb_fopen( const char *path, const char *mode ); +extern HB_EXPORT FILE * hb_fopen( const char *path, const char *mode ); HB_EXTERN_END diff --git a/harbour/include/hbgtcore.h b/harbour/include/hbgtcore.h index de3a2ce985..92bcbe7d13 100644 --- a/harbour/include/hbgtcore.h +++ b/harbour/include/hbgtcore.h @@ -343,8 +343,8 @@ typedef struct _HB_GT_BASE extern HB_EXPORT PHB_GT hb_gt_Base( void ); extern HB_EXPORT void hb_gt_BaseFree( PHB_GT pGT ); -extern PHB_GT hb_gt_ItemBase( PHB_ITEM pItemGT ); -extern void hb_gt_gcMark( void ); +extern HB_EXPORT PHB_GT hb_gt_ItemBase( PHB_ITEM pItemGT ); +extern HB_EXPORT void hb_gt_gcMark( void ); #define HB_GTLOCAL(g) (g)->pGTData[*HB_GTID_PTR] @@ -600,11 +600,11 @@ extern int hb_gt_chrmapinit( int * piTransTbl, const char * pszTerm, HB_BOOL fS extern HB_BOOL hb_gt_setClipboard( const char * szClipData, HB_SIZE nLen ); extern HB_BOOL hb_gt_getClipboard( char ** pszClipData, HB_SIZE * pnLen ); #if defined( HB_OS_WIN ) -extern HB_BOOL hb_gt_winapi_setClipboard( HB_UINT uFormat, PHB_ITEM pItem ); -extern HB_BOOL hb_gt_winapi_getClipboard( HB_UINT uFormat, PHB_ITEM pItem ); -extern int hb_gt_winapi_getKbdState( void ); -extern void hb_gt_winapi_setKbdState( int kbdShifts ); -extern void hb_gt_winapi_tone( double dFrequency, double dDuration ); +extern HB_EXPORT HB_BOOL hb_gt_winapi_setClipboard( HB_UINT uFormat, PHB_ITEM pItem ); +extern HB_EXPORT HB_BOOL hb_gt_winapi_getClipboard( HB_UINT uFormat, PHB_ITEM pItem ); +extern HB_EXPORT int hb_gt_winapi_getKbdState( void ); +extern HB_EXPORT void hb_gt_winapi_setKbdState( int kbdShifts ); +extern HB_EXPORT void hb_gt_winapi_tone( double dFrequency, double dDuration ); #endif /* HB_OS_WIN */ #if defined( HB_OS_DOS ) || defined( HB_OS_WIN ) || defined( HB_OS_OS2 ) extern int hb_gt_dos_keyCodeTranslate( int iKey );