diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d81c17ad9e..bbb1f53192 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-23 02:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.*.po + * utils/hbmk2/hbmk2.prg + + Added recently added options to help text. + 2011-04-23 02:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * ChangeLog ! Missed to document one change: @@ -241,7 +246,7 @@ ; Checkme. * utils/hbmk2/hbmk2.prg - + -depinclibs= also supports multiple arguments separated by ';'. + + -depimplibs= also supports multiple arguments separated by ';'. 2011-04-20 13:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmxml/hbmxml.hbp diff --git a/harbour/utils/hbmk2/hbmk2.es_PE.po b/harbour/utils/hbmk2/hbmk2.es_PE.po index 8a7b5e2bff..55dc868046 100644 --- a/harbour/utils/hbmk2/hbmk2.es_PE.po +++ b/harbour/utils/hbmk2/hbmk2.es_PE.po @@ -1238,7 +1238,7 @@ msgstr "" #: hbmk2.prg:11633 #, c-format -msgid " is the name of the dependency. Add to the import library source list" +msgid " is the name of the dependency. Add to the import library source list. May be ';' delimited list of paths." msgstr "" #: hbmk2.prg:11633 diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index ad9b6589b4..c9e433bf62 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -1234,7 +1234,7 @@ msgstr "" #: hbmk2.prg:11633 #, c-format -msgid " is the name of the dependency. Add to the import library source list" +msgid " is the name of the dependency. Add to the import library source list. May be ';' delimited list of paths." msgstr "" #: hbmk2.prg:11633 diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index e4e099fa18..58ae5e2da8 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2286,10 +2286,10 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) DO CASE CASE SubStr( cParamL, 4 ) == "iso90" ; hbmk[ _HBMK_cC ] := "iso90" CASE SubStr( cParamL, 4 ) == "iso99" ; hbmk[ _HBMK_cC ] := "iso99" - CASE SubStr( cParamL, 4 ) == "iso1x" ; hbmk[ _HBMK_cC ] := "iso1X" + CASE SubStr( cParamL, 4 ) == "iso1x" ; hbmk[ _HBMK_cC ] := "iso1x" CASE SubStr( cParamL, 4 ) == "gnu90" ; hbmk[ _HBMK_cC ] := "gnu90" CASE SubStr( cParamL, 4 ) == "gnu99" ; hbmk[ _HBMK_cC ] := "gnu99" - CASE SubStr( cParamL, 4 ) == "gnu1x" ; hbmk[ _HBMK_cC ] := "gnu1X" + CASE SubStr( cParamL, 4 ) == "gnu1x" ; hbmk[ _HBMK_cC ] := "gnu1x" CASE SubStr( cParamL, 4 ) == "" ; hbmk[ _HBMK_cC ] := "" ENDCASE @@ -12059,6 +12059,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-[no]debug" , I_( "add/exclude C compiler debug info. For Harbour level debug, use Harbour option -b as usual" ) },; { "-[no]optim" , I_( "toggle C compiler optimizations (default: on)" ) },; { "-[no]cpp[=def]" , I_( "force C/C++ mode or reset to default" ) },; + { "-c=[]" , I_( "select C standard. Allowed values are: iso90, iso99, iso1x, gnu90, gnu99, gnu1x" ) },; + { "-cpp=[]" , I_( "select C++ standard. Allowed values are: iso98, iso03, iso0x, gnu98, gnu0x" ) },; { "-[no]map" , I_( "create (or not) a map file" ) },; { "-[no]implib" , I_( "create (or not) an import library (in -hbdyn/-hbexe mode). The name will have a postfix added." ) },; { "-implib=" , I_( "create import library (in -hbdyn/-hbexe mode) name to (default: same as output)" ) },; @@ -12102,6 +12104,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-dflag=" , I_( "pass flag to linker (dynamic library)" ) },; { "-iflag=" , I_( "pass flag to import library creation command" ) },; { "-runflag=" , I_( "pass flag to output executable when -run option is used" ) },; + { "-cflag+=" , I_( "pass flag to C compiler overriding C compiler flags added by hbmk2 itself. Use with caution." ) },; { "-3rd=" , I_( "options/flags reserved for 3rd party tools, always ignored by hbmk2 itself" ) },; { "-jobs=" , I_( "start n compilation threads (multiprocess platforms only)" ) },; { "-inc" , I_( "enable incremental build mode" ) },; @@ -12126,7 +12129,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-depcontrol=" , I_( " is the name of the dependency. is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_" ) },; { "-depincpath=" , I_( " is the name of the dependency. Add to the header detection path list. May be ';' delimited list of paths." ) },; { "-depincpathlocal= " , I_( " is the name of the dependency. Add to the header detection path list, where is pointing to a directory local to the project and containing an embedded (or locally hosted) dependency." ) },; - { "-depimplibs=" , I_( " is the name of the dependency. Add to the import library source list" ) },; + { "-depimplibs=" , I_( " is the name of the dependency. Add to the import library source list. May be ';' delimited list of paths." ) },; { "-depimplibd=" , I_( " is the name of the dependency. Set generated import library name to " ) },; NIL,; { "-plugin=<.prg|.hbs|.hrb>", I_( "add plugin" ) },; diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po index a9cdbf86c2..11f45c9347 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -1238,7 +1238,7 @@ msgstr "" #: hbmk2.prg:11633 #, c-format -msgid " is the name of the dependency. Add to the import library source list" +msgid " is the name of the dependency. Add to the import library source list. May be ';' delimited list of paths." msgstr "" #: hbmk2.prg:11633