2012-03-30 19:38 UTC+0200 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
! fixed foreign make file conversion to add comment
prefix for original filename included in .hbp file
+ .xbp conversion will add -hblib and -hbdyn if filename
contains .lib and .dll respectively. (not sure how
is this official rule or just convention or anything)
This commit is contained in:
@@ -11820,7 +11820,7 @@ STATIC PROCEDURE convert_hbmake_to_hbp( hbmk, cSrcName, cDstName )
|
||||
ENDIF
|
||||
|
||||
AAdd( aDst, "# Automatically converted by hbmk2 from hbmake project:" )
|
||||
AAdd( aDst, cSrcName )
|
||||
AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
|
||||
AAdd( aDst, "" )
|
||||
|
||||
cSrc := StrTran( cSrc, Chr( 13 ) + Chr( 10 ), Chr( 10 ) )
|
||||
@@ -11951,9 +11951,15 @@ STATIC PROCEDURE convert_xbp_to_hbp( hbmk, cSrcName, cDstName )
|
||||
ENDIF
|
||||
|
||||
AAdd( aDst, "# Automatically converted by hbmk2 from xbuild project:" )
|
||||
AAdd( aDst, cSrcName )
|
||||
AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
|
||||
AAdd( aDst, "" )
|
||||
|
||||
IF ".lib" $ cSrcName
|
||||
AAdd( aDst, "-hblib" )
|
||||
ELSEIF ".dll" $ cSrcName
|
||||
AAdd( aDst, "-hbdyn" )
|
||||
ENDIF
|
||||
|
||||
cSrc := StrTran( cSrc, Chr( 13 ) + Chr( 10 ), Chr( 10 ) )
|
||||
cSrc := StrTran( cSrc, Chr( 9 ), " " )
|
||||
|
||||
@@ -12075,7 +12081,7 @@ STATIC PROCEDURE convert_xhp_to_hbp( hbmk, cSrcName, cDstName )
|
||||
ENDIF
|
||||
|
||||
AAdd( aDst, "# Automatically converted by hbmk2 from xMate project:" )
|
||||
AAdd( aDst, cSrcName )
|
||||
AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
|
||||
AAdd( aDst, "" )
|
||||
|
||||
cSrc := StrTran( cSrc, Chr( 13 ) + Chr( 10 ), Chr( 10 ) )
|
||||
|
||||
Reference in New Issue
Block a user