From a7a7a06003bd4b661ba4b0c22fdbca9d95772683 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 17 May 2009 17:55:44 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 6 ++++++ harbour/utils/hbmk2/hbmk2.prg | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 52dd3ff915..4c9446333d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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 diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index d308f7a18e..1c9a165ee4 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -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 */