From cd7aec019953656d7b36f2f5fb5a859bace466de Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 7 May 2010 16:17:18 +0000 Subject: [PATCH] 2010-05-07 18:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fix to recent mkimplib change. --- harbour/ChangeLog | 4 ++++ harbour/utils/hbmk2/hbmk2.prg | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 30dc5396a0..cba8ccf7eb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-05-07 18:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fix to recent mkimplib change. + 2010-05-07 17:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL - Deleted 'rarely updated' from official mingw comment. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 3854171f49..41e49a6054 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1776,10 +1776,6 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) lMakeImpLibMS_bcc := .T. - CASE lMakeImpLib .AND. Empty( cMakeImpLibLib ) - - cMakeImpLibLib := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, ArchCompFilter( hbmk, cParam ), aParam[ _PAR_cFileName ] ), aParam[ _PAR_cFileName ] ) ) - CASE Left( cParamL, Len( "-jobs=" ) ) == "-jobs=" cParam := ArchCompFilter( hbmk, SubStr( cParam, Len( "-jobs=" ) + 1 ) ) @@ -2198,6 +2194,10 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) hbmk[ _HBMK_cHBL ] := PathSepToTarget( hbmk, cParam ) hbmk[ _HBMK_cHBLDir ] := FN_DirGet( aParam[ _PAR_cFileName ] ) + CASE lMakeImpLib .AND. Empty( cMakeImpLibLib ) + + cMakeImpLibLib := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, ArchCompFilter( hbmk, cParam ), aParam[ _PAR_cFileName ] ), aParam[ _PAR_cFileName ] ) ) + OTHERWISE cParam := ArchCompFilter( hbmk, cParam )