fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-02-17 11:52 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk/hbmk.prg
    + Added support to pass .hbp files on the command line.

  * contrib/hbwin/wapi_commctrl.c
  * contrib/hbwin/hbwapi.h
    ! Remaining comments changed to ANSI.
This commit is contained in:
Viktor Szakats
2009-02-16 10:53:16 +00:00
parent cdaf5e8f4a
commit cd5c391aff
4 changed files with 101 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-17 11:52 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk/hbmk.prg
+ Added support to pass .hbp files on the command line.
* contrib/hbwin/wapi_commctrl.c
* contrib/hbwin/hbwapi.h
! Remaining comments changed to ANSI.
2009-02-16 00:10 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/gtwvg/common.mak
* harbour/contrib/gtwvg/Makefile

65
harbour/contrib/hbwin/hbwapi.h
View File

@@ -51,45 +51,42 @@
*/
#ifndef __HBWAPI_H
#define __HBWAPI_H
#define __HBWAPI_H
/*
If we implement pointers than we need to return back pointers in all
those functions which return a handle. My existing code checks for the
return values and compare it against some numeric. So for time being
I am deferring the use of pointers till we come up with a common solution.
/*
If we implement pointers than we need to return back pointers in all
those functions which return a handle. My existing code checks for the
return values and compare it against some numeric. So for time being
I am deferring the use of pointers till we come up with a common solution.
#define wapi_par_WPARAM( n ) ( ( WPARAM ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : hb_parptr( n ) ) )
*/
#define wapi_par_WPARAM( n ) ( ( WPARAM ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : hb_parptr( n ) ) )
*/
#define wapi_par_WNDPROC( n ) ( ( WNDPROC ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_WPARAM( n ) ( ( WPARAM ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_LPARAM( n ) ( ( LPARAM ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HWND( n ) ( ( HWND ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HDC( n ) ( ( HDC ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HANDLE( n ) ( ( HANDLE ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HGDIOBJ( n ) ( ( HGDIOBJ ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HBRUSH( n ) ( ( HBRUSH ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HBITMAP( n ) ( ( HBITMAP ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HICON( n ) ( ( HICON ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HIMAGELIST( n ) ( ( HIMAGELIST ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HFONT( n ) ( ( HFONT ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HINSTANCE( n ) ( ( HINSTANCE ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_COLORREF( n ) ( ( COLORREF ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_WNDPROC( n ) ( ( WNDPROC ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_WPARAM( n ) ( ( WPARAM ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_LPARAM( n ) ( ( LPARAM ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HWND( n ) ( ( HWND ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HDC( n ) ( ( HDC ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HANDLE( n ) ( ( HANDLE ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HGDIOBJ( n ) ( ( HGDIOBJ ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HBRUSH( n ) ( ( HBRUSH ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HBITMAP( n ) ( ( HBITMAP ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HICON( n ) ( ( HICON ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HIMAGELIST( n ) ( ( HIMAGELIST ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HFONT( n ) ( ( HFONT ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_HINSTANCE( n ) ( ( HINSTANCE ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_COLORREF( n ) ( ( COLORREF ) ( ISNUM( n ) ? ( HB_PTRDIFF ) hb_parnint( n ) : ( HB_PTRDIFF ) hb_parptr( n ) ) )
#define wapi_par_STRUCT( n ) ( hb_parc( n ) )
#define wapi_par_STRUCT( n ) ( hb_parc( n ) )
#define wapi_par_INT( n ) ( hb_parni( n ) )
#define wapi_par_UINT( n ) ( ( UINT ) hb_parni( n ) )
#define wapi_par_INT( n ) ( hb_parni( n ) )
#define wapi_par_UINT( n ) ( ( UINT ) hb_parni( n ) )
#define wapi_ret_NI( i ) ( hb_retni( i ) )
#define wapi_ret_L( b ) ( hb_retl( b ) )
#define wapi_ret_NI( i ) ( hb_retni( i ) )
#define wapi_ret_L( b ) ( hb_retl( b ) )
#define wapi_ret_HANDLE( h ) ( hb_retptr( h ) )
#define wapi_ret_HRESULT( hr ) ( hb_retptr( hr ) )
#define wapi_ret_COLORREF( cr ) ( hb_retnint( ( HB_PTRDIFF ) cr ) )
#endif //__HBWAPI_H
#define wapi_ret_HANDLE( h ) ( hb_retptr( h ) )
#define wapi_ret_HRESULT( hr ) ( hb_retptr( hr ) )
#define wapi_ret_COLORREF( cr ) ( hb_retnint( ( HB_PTRDIFF ) cr ) )
#endif /* __HBWAPI_H */

75
harbour/contrib/hbwin/wapi_commctrl.c
View File

@@ -47,7 +47,7 @@
* If you do not wish that, delete this exception notice.
*
*/
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
#define HB_OS_WIN_USED
@@ -67,7 +67,7 @@ HB_FUNC( WAPI_IMAGELIST_ADD )
wapi_par_HBITMAP( 2 ),
ISNIL( 3 ) ? NULL : wapi_par_HBITMAP( 3 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
int ImageList_AddMasked( HIMAGELIST himl, HBITMAP hbmImage, COLORREF crMask );
*/
@@ -77,7 +77,7 @@ HB_FUNC( WAPI_IMAGELIST_ADDMASKED )
wapi_par_HBITMAP( 2 ),
wapi_par_COLORREF( 3 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_BeginDrag( HIMAGELIST himlTrack, int iTrack, int dxHotspot, int dyHotspot );
*/
@@ -88,7 +88,7 @@ HB_FUNC( WAPI_IMAGELIST_BEGINDRAG )
wapi_par_INT( 3 ),
wapi_par_INT( 4 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HRESULT ImageList_CoCreateInstance( REFCLSID rclsid, const IUnknown *punkOuter, REFIID riid, void **ppv );
*/
@@ -97,7 +97,7 @@ HB_FUNC( WAPI_IMAGELIST_COCREATEINSTANCE )
{
}
#endif
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_Copy( HIMAGELIST himlDst, int iDst, HIMAGELIST himlSrc, int iSrc, UINT uFlags );
*/
@@ -109,7 +109,7 @@ HB_FUNC( WAPI_IMAGELIST_COPY )
wapi_par_INT( 4 ),
wapi_par_UINT( 5 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HIMAGELIST ImageList_Create( int cx, int cy, UINT flags, int cInitial, int cGrow );
*/
@@ -135,7 +135,7 @@ HB_FUNC( WAPI_IMAGELIST_CREATE )
wapi_par_INT( 5 ) ) );
#endif
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_Destroy( HIMAGELIST himl );
*/
@@ -143,7 +143,7 @@ HB_FUNC( WAPI_IMAGELIST_DESTROY )
{
wapi_ret_L( ImageList_Destroy( wapi_par_HIMAGELIST( 1 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_DragEnter( HWND hwndLock, int x, int y );
*/
@@ -153,7 +153,7 @@ HB_FUNC( WAPI_IMAGELIST_DRAGENTER )
wapi_par_INT( 2 ),
wapi_par_INT( 3 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_DragLeave( HWND hwndLock );
*/
@@ -161,7 +161,7 @@ HB_FUNC( WAPI_IMAGELIST_DRAGLEAVE )
{
wapi_ret_L( ImageList_DragLeave( wapi_par_HWND( 1 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_DragMove( int x, int y );
*/
@@ -169,7 +169,7 @@ HB_FUNC( WAPI_IMAGELIST_DRAGMOVE )
{
wapi_ret_L( ImageList_DragMove( wapi_par_INT( 1 ), wapi_par_INT( 2 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_DragShowNolock( BOOL fShow );
*/
@@ -177,7 +177,7 @@ HB_FUNC( WAPI_IMAGELIST_DRAGSHOWNOLOCK )
{
wapi_ret_L( ImageList_DragShowNolock( hb_parl( 1 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_Draw( HIMAGELIST himl, int i, HDC hdcDst, int x, int y, UINT fStyle );
*/
@@ -190,7 +190,7 @@ HB_FUNC( WAPI_IMAGELIST_DRAW )
wapi_par_INT( 5 ),
wapi_par_UINT( 6 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_DrawEx( HIMAGELIST himl, int i, HDC hdcDst, int x, int y, int dx, int dy,
COLORREF rgbBk, COLORREF rgbFg, UINT fStyle );
@@ -208,7 +208,7 @@ HB_FUNC( WAPI_IMAGELIST_DRAWEX )
wapi_par_COLORREF( 9 ),
wapi_par_UINT( 10 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_DrawIndirect( IMAGELISTDRAWPARAMS *pimldp );
*/
@@ -217,7 +217,7 @@ HB_FUNC( WAPI_IMAGELIST_DRAWINDIRECT )
{
}
#endif
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HIMAGELIST ImageList_Duplicate( HIMAGELIST himl );
*/
@@ -225,7 +225,7 @@ HB_FUNC( WAPI_IMAGELIST_DUPLICATE )
{
wapi_ret_HANDLE( ImageList_Duplicate( wapi_par_HIMAGELIST( 1 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
VOID ImageList_EndDrag( VOID );
*/
@@ -235,7 +235,7 @@ HB_FUNC( WAPI_IMAGELIST_ENDDRAG )
ImageList_EndDrag();
}
#endif
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
COLORREF ImageList_GetBkColor( HIMAGELIST himl );
*/
@@ -243,7 +243,7 @@ HB_FUNC( WAPI_IMAGELIST_GETBKCOLOR )
{
wapi_ret_COLORREF( ImageList_GetBkColor( wapi_par_HIMAGELIST( 1 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HIMAGELIST ImageList_GetDragImage( POINT *ppt, POINT *pptHotspot );
*/
@@ -252,7 +252,7 @@ HB_FUNC( WAPI_IMAGELIST_GETDRAGIMAGE )
{
}
#endif
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HICON ImageList_GetIcon( HIMAGELIST himl, int i, UINT flags );
*/
@@ -262,7 +262,7 @@ HB_FUNC( WAPI_IMAGELIST_GETICON )
wapi_par_INT( 2 ),
wapi_par_UINT( 3 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_GetIconSize( HIMAGELIST himl, int *cx, int *cy );
*/
@@ -282,7 +282,7 @@ HB_FUNC( WAPI_IMAGELIST_GETICONSIZE )
hb_retl( 0 );
}
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
int ImageList_GetImageCount( HIMAGELIST himl );
*/
@@ -290,7 +290,7 @@ HB_FUNC( WAPI_IMAGELIST_GETIMAGECOUNT )
{
wapi_ret_NI( ImageList_GetImageCount( wapi_par_HIMAGELIST( 1 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/* T O R E V I E W
BOOL ImageList_GetImageInfo( HIMAGELIST himl, int i, IMAGEINFO *pImageInfo );
@@ -304,7 +304,7 @@ HB_FUNC( WAPI_IMAGELIST_GETIMAGEINFO )
hb_retclen( ( char* ) &ii, sizeof( IMAGEINFO ) );
}
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HIMAGELIST ImageList_LoadImage( HINSTANCE hi, LPCTSTR lpbmp, int cx, int cGrow,
COLORREF crMask, UINT uType, UINT uFlags );
@@ -326,7 +326,7 @@ HB_FUNC( WAPI_IMAGELIST_LOADIMAGE )
wapi_par_UINT( 6 ),
wapi_par_UINT( 7 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HIMAGELIST ImageList_Merge( HIMAGELIST himl1, int i1, HIMAGELIST himl2, int i2, int dx, int dy );
*/
@@ -340,7 +340,7 @@ HB_FUNC( WAPI_IMAGELIST_MERGE )
wapi_par_INT( 6 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HIMAGELIST ImageList_Read( LPSTREAM pstm );
*/
@@ -349,7 +349,7 @@ HB_FUNC( WAPI_IMAGELIST_READ )
{
}
#endif
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HRESULT ImageList_ReadEx( DWORD dwFlags, LPSTREAM pstm, REFIID riid, void **ppv );
*/
@@ -358,7 +358,7 @@ HB_FUNC( WAPI_IMAGELIST_READEX )
{
}
#endif
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_Remove( HIMAGELIST himl, int i );
*/
@@ -367,7 +367,7 @@ HB_FUNC( WAPI_IMAGELIST_REMOVE )
wapi_ret_L( ImageList_Remove( wapi_par_HIMAGELIST( 1 ),
wapi_par_INT( 2 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_Replace( HIMAGELIST himl, int i, HBITMAP hbmImage, HBITMAP hbmMask );
*/
@@ -378,7 +378,7 @@ HB_FUNC( WAPI_IMAGELIST_REPLACE )
wapi_par_HBITMAP( 3 ),
wapi_par_HBITMAP( 4 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
int ImageList_ReplaceIcon( HIMAGELIST himl, int i, HICON hicon );
*/
@@ -389,7 +389,7 @@ HB_FUNC( WAPI_IMAGELIST_REPLACEICON )
wapi_par_HICON( 3 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
COLORREF ImageList_SetBkColor( HIMAGELIST himl, COLORREF clrBk );
*/
@@ -398,7 +398,7 @@ HB_FUNC( WAPI_IMAGELIST_SETBKCOLOR )
wapi_ret_COLORREF( ImageList_SetBkColor( wapi_par_HIMAGELIST( 1 ),
wapi_par_COLORREF( 2 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
int ImageList_SetColorTable( HIMAGELIST himl, int start, int len, RGBQUAD *prgb );
*/
@@ -410,7 +410,7 @@ HB_FUNC( WAPI_IMAGELIST_SETCOLORTABLE )
wapi_par_INT( 3 ),
}
#endif
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_SetDragCursorImage( HIMAGELIST himlDrag, int iDrag, int dxHotspot, int dyHotspot );
*/
@@ -421,7 +421,7 @@ HB_FUNC( WAPI_IMAGELIST_SETDRAGCURSORIMAGE )
wapi_par_INT( 3 ),
wapi_par_INT( 4 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_SetIconSize( HIMAGELIST himl, int cx, int cy );
*/
@@ -431,7 +431,7 @@ HB_FUNC( WAPI_IMAGELIST_SETICONSIZE )
wapi_par_INT( 2 ),
wapi_par_INT( 3 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_SetImageCount( HIMAGELIST himl, UINT uNewCount );
*/
@@ -440,7 +440,7 @@ HB_FUNC( WAPI_IMAGELIST_SETIMAGECOUNT )
wapi_ret_L( ImageList_SetImageCount( wapi_par_HIMAGELIST( 1 ),
wapi_par_UINT( 2 ) ) );
}
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_SetOverlayImage( HIMAGELIST himl, int iImage, int iOverlay );
*/
@@ -449,7 +449,7 @@ HB_FUNC( WAPI_IMAGELIST_SETOVERLAYIMAGE )
{
}
#endif
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
BOOL ImageList_Write( HIMAGELIST himl, LPSTREAM pstm );
*/
@@ -458,7 +458,7 @@ HB_FUNC( WAPI_IMAGELIST_WRITE )
{
}
#endif
//----------------------------------------------------------------------//
/*----------------------------------------------------------------------*/
/*
HRESULT ImageList_WriteEx( HIMAGELIST himl, DWORD dwFlags, LPSTREAM pstm );
*/
@@ -470,4 +470,3 @@ HB_FUNC( WAPI_IMAGELIST_WRITEEX )
/*----------------------------------------------------------------------//
// END - ImageList_* - API
//----------------------------------------------------------------------*/

31
harbour/utils/hbmk/hbmk.prg
View File

@@ -454,6 +454,23 @@ FUNCTION Main( ... )
CASE Left( cParam, 2 ) == "-l" .AND. ;
Len( cParam ) > 2 ; AAddNotEmpty( s_aLIBUSER, DirAdaptPathSep( ArchCompFilter( SubStr( cParam, 3 ) ) ) )
CASE Left( cParam, 1 ) == "-" ; AAdd( s_aOPTPRG , DirAdaptPathSep( cParam ) )
CASE Lower( ExtGet( cParam ) ) == ".hbp"
HBP_ProcessOne( cParam,;
@s_aLIB,;
@s_aOPTPRG,;
@s_aOPTC,;
@s_aOPTL,;
@s_lGUI,;
@s_lMT,;
@s_lSHARED,;
@s_lDEBUG,;
@s_lNULRDD,;
@s_lMAP,;
@s_lSTRIP,;
@s_lRUN,;
@s_cGT )
CASE Lower( ExtGet( cParam ) ) == ".prg" ; AAdd( s_aPRG , DirAdaptPathSep( cParam ) ) ; DEFAULT s_cPROGNAME TO DirAdaptPathSep( cParam )
CASE Lower( ExtGet( cParam ) ) == ".rc" ; AAdd( s_aRESSRC , DirAdaptPathSep( cParam ) )
CASE Lower( ExtGet( cParam ) ) == ".res" ; AAdd( s_aRESCMP , DirAdaptPathSep( cParam ) )
@@ -1093,7 +1110,7 @@ STATIC PROCEDURE HBP_ProcessAll( /* @ */ aLIBS,;
IF ! t_lQuiet
OutStd( "hbmk: Processing: " + aFile[ F_NAME ] + hb_osNewLine() )
ENDIF
HBP_ProcessOne( hb_MemoRead( aFile[ F_NAME ] ),;
HBP_ProcessOne( aFile[ F_NAME ],;
@aLIBS,;
@aOPTPRG,;
@aOPTC,;
@@ -1113,7 +1130,7 @@ STATIC PROCEDURE HBP_ProcessAll( /* @ */ aLIBS,;
#define _EOL Chr( 10 )
STATIC PROCEDURE HBP_ProcessOne( cFile,;
STATIC PROCEDURE HBP_ProcessOne( cFileName,;
/* @ */ aLIBS,;
/* @ */ aOPTPRG,;
/* @ */ aOPTC,;
@@ -1127,6 +1144,7 @@ STATIC PROCEDURE HBP_ProcessOne( cFile,;
/* @ */ lSTRIP,;
/* @ */ lRUN,;
/* @ */ cGT )
LOCAL cFile := hb_MemoRead( cFileName )
LOCAL cLine
LOCAL cItem
@@ -1333,7 +1351,7 @@ STATIC PROCEDURE ShowHeader()
STATIC PROCEDURE ShowHelp()
LOCAL aText := {;
"Syntax: hbmk [options] [<@s>|<s.hbm>] <src[s][.prg|.c]> [-l<lib>] [-o<obj>]" ,;
"Syntax: hbmk [options] [<script[s]>] <src[s][.prg|.c]> [-l<lib>] [-o<obj>]" ,;
"" ,;
"Options:" ,;
" -o<outname> output file name" ,;
@@ -1351,12 +1369,13 @@ STATIC PROCEDURE ShowHelp()
" -strip|-nostrip strip (no strip) binaries" ,;
" -trace|-notrace show commands executed" ,;
" -run|-norun run/don't run the created executable" ,;
" -nohbp do not process .hbp files" ,;
" -nohbp do not process .hbp files in current dir" ,;
" -q quiet mode" ,;
"" ,;
"Notes:" ,;
" - Don't forget to create a MAIN() function in your application." ,;
" - Multiple -l, -o, @, .hbm parameters are accepted." ,;
" - Don't forget to create a MAIN() entry function in your application." ,;
" - <script> can be <@script> (.hbm file), <script.hbm> or <script.hbp>." ,;
" - Multiple -l, -o parameters are accepted." ,;
" - .hbp option files in current dir are automatically processed." ,;
" - .hbp options (they should come in separate lines):" ,;
" libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags]" ,;