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

2009-05-17 19:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Just added bcc hack fixed to not cause problems when 
      bcc is explicitly selected, but the compiler cannot be 
      detected in path.
This commit is contained in:
Viktor Szakats
2009-05-17 17:55:44 +00:00
parent d2ddaaf0e0
commit a7a7a06003
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -17,6 +17,12 @@
past entries belonging to these authors: Viktor Szakats.
*/
2009-05-17 19:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
! Just added bcc hack fixed to not cause problems when
bcc is explicitly selected, but the compiler cannot be
detected in path.
2009-05-17 19:40 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
+ Added automatic bcc configuration hack to add PSDK dir to

8
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -876,6 +876,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
FOR tmp := 1 TO Len( aCOMPDET )
IF ! Empty( tmp1 := Eval( aCOMPDET[ tmp ][ _COMPDET_bBlock ] ) )
hbmk[ _HBMK_cCOMP ] := aCOMPDET[ tmp ][ _COMPDET_cCOMP ]
/* NOTE: Hack to tweak bcc setup by hbmk2 to include one
compiler lib dir to lib search path. */
IF hbmk[ _HBMK_cCOMP ] == "bcc"
AAdd( hbmk[ _HBMK_aLIBPATH ], _BCC_PSDK_LIBPATH( tmp1 ) )
ENDIF
@@ -913,8 +915,12 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
hbmk_OutErr( hb_StrFormat( I_( "Error: Compiler value unknown: %1$s" ), hbmk[ _HBMK_cCOMP ] ) )
RETURN 2
ENDIF
/* NOTE: Hack to tweak bcc setup by hbmk2 to include one
compiler lib dir to lib search path. */
IF hbmk[ _HBMK_cCOMP ] == "bcc"
AAdd( hbmk[ _HBMK_aLIBPATH ], _BCC_PSDK_LIBPATH( _BCC_BIN_DETECT() ) )
IF ! Empty( tmp1 := _BCC_BIN_DETECT() )
AAdd( hbmk[ _HBMK_aLIBPATH ], _BCC_PSDK_LIBPATH( tmp1 ) )
ENDIF
ENDIF
IF hbmk[ _HBMK_cARCH ] $ "win|wce"
/* Detect cross platform CCPREFIX and CCPATH if embedded MinGW installation is detected */