From 0614cee9a5de060fb16ca7390f2c32941fde5ab4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 18 May 2009 16:08:14 +0000 Subject: [PATCH] 2009-05-18 18:03 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Fixed handling of self-detected name inducted automatic options (like -xhb when xhbmk2 is used) after adding multitarget support. --- harbour/ChangeLog | 6 ++++++ harbour/utils/hbmk2/hbmk2.prg | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e61d79ceb2..568500985c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-18 18:03 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + ! Fixed handling of self-detected name inducted automatic + options (like -xhb when xhbmk2 is used) after adding + multitarget support. + 2009-05-18 17:54 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Fixed handling empty command lines. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index cd8a14ce5b..090a964f63 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -238,24 +238,24 @@ PROCEDURE Main( ... ) IF Left( tmp, 1 ) == "x" tmp := SubStr( tmp, 2 ) - AAdd( aArgs, "-xhb" ) + hb_AIns( aArgs, 1, "-xhb", .T. ) ENDIF DO CASE CASE Right( tmp, 5 ) == "hbcmp" .OR. ; Left( tmp, 5 ) == "hbcmp" .OR. ; - tmp == "clipper" ; AAdd( aArgs, "-hbcmp" ) + tmp == "clipper" ; hb_AIns( aArgs, 1, "-hbcmp", .T. ) CASE Right( tmp, 4 ) == "hbcc" .OR. ; - Left( tmp, 4 ) == "hbcc" ; AAdd( aArgs, "-hbcc" ) + Left( tmp, 4 ) == "hbcc" ; hb_AIns( aArgs, 1, "-hbcc", .T. ) CASE Right( tmp, 5 ) == "hblnk" .OR. ; - Left( tmp, 5 ) == "hblnk" ; AAdd( aArgs, "-hblnk" ) + Left( tmp, 5 ) == "hblnk" ; hb_AIns( aArgs, 1, "-hblnk", .T. ) CASE tmp == "rtlink" .OR. ; tmp == "exospace" .OR. ; - tmp == "blinker" ; AAdd( aArgs, "-rtlink" ) + tmp == "blinker" ; hb_AIns( aArgs, 1, "-rtlink", .T. ) CASE Right( tmp, 5 ) == "hblib" .OR. ; - Left( tmp, 5 ) == "hblib" ; AAdd( aArgs, "-hblib" ) + Left( tmp, 5 ) == "hblib" ; hb_AIns( aArgs, 1, "-hblib", .T. ) CASE Right( tmp, 5 ) == "hbdyn" .OR. ; - Left( tmp, 5 ) == "hbdyn" ; AAdd( aArgs, "-hbdyn" ) + Left( tmp, 5 ) == "hbdyn" ; hb_AIns( aArgs, 1, "-hbdyn", .T. ) ENDCASE ENDIF