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

2009-06-05 09:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Now if hbmk2 is renamed to a name which ends with '10',
      like 'hbmk210', it will automatically function in -hb10 
      (Harbour 1.0.x) compatibility mode.
    % Don't add doubly defined include paths or include try paths.
    * Minor change in BCC system lib ordering.
This commit is contained in:
Viktor Szakats
2009-06-05 07:38:09 +00:00
parent 692207db83
commit da084f7167
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to these authors: Viktor Szakats.
*/
2009-06-05 09:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Now if hbmk2 is renamed to a name which ends with '10',
like 'hbmk210', it will automatically function in -hb10
(Harbour 1.0.x) compatibility mode.
% Don't add doubly defined include paths or include try paths.
* Minor change in BCC system lib ordering.
2009-06-05 07:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* examples/terminal/trm_cli.prg
* examples/terminal/terminal.prg

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

@@ -276,6 +276,8 @@ PROCEDURE Main( ... )
IF Left( tmp, 1 ) == "x"
tmp := SubStr( tmp, 2 )
AAdd( aArgsProc, "-xhb" )
ELSEIF Right( tmp, 2 ) == "10"
AAdd( aArgsProc, "-hb10" )
ENDIF
DO CASE
@@ -1480,7 +1482,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cParam := PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-incpath=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] )
IF ! Empty( cParam )
AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToTarget( hbmk, cParam ) )
cParam := PathSepToTarget( hbmk, cParam )
IF AScan( hbmk[ _HBMK_aINCPATH ], {|tmp| tmp == cParam } ) == 0
AAdd( hbmk[ _HBMK_aINCPATH ], cParam )
ENDIF
ENDIF
CASE Left( cParamL, Len( "-inctrypath=" ) ) == "-inctrypath=" .AND. ;
@@ -1488,7 +1493,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cParam := PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-inctrypath=" ) + 1 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] )
IF ! Empty( cParam )
AAdd( hbmk[ _HBMK_aINCTRYPATH ], PathSepToTarget( hbmk, cParam ) )
cParam := PathSepToTarget( hbmk, cParam )
IF AScan( hbmk[ _HBMK_aINCTRYPATH ], {|tmp| tmp == cParam } ) == 0
AAdd( hbmk[ _HBMK_aINCTRYPATH ], cParam )
ENDIF
ENDIF
CASE Left( cParamL, 2 ) == "-i" .AND. ;
@@ -1496,7 +1504,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cParam := PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] )
IF ! Empty( cParam )
AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToTarget( hbmk, cParam ) )
cParam := PathSepToTarget( hbmk, cParam )
IF AScan( hbmk[ _HBMK_aINCPATH ], {|tmp| tmp == cParam } ) == 0
AAdd( hbmk[ _HBMK_aINCPATH ], cParam )
ENDIF
ENDIF
CASE Left( cParamL, Len( "-stop" ) ) == "-stop"
@@ -2470,8 +2481,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cResExt := ".res"
cBin_Link := "ilink32.exe"
cBin_Dyn := cBin_Link
cOpt_Link := '-Gn -Tpe -L"{DL}" {FL} ' + iif( hbmk[ _HBMK_lGUI ], "c0w32.obj", "c0x32.obj" ) + " {LO}, {OE}, " + iif( hbmk[ _HBMK_lMAP ], "{OM}", "nul" ) + ", {LL} import32.lib cw32mt.lib,, {LS}{SCRIPT}"
cOpt_Dyn := '-Gn -Tpd -L"{DL}" {FD} ' + "c0d32.obj" + " {LO}, {OD}, " + iif( hbmk[ _HBMK_lMAP ], "{OM}", "nul" ) + ", {LL} import32.lib cw32mt.lib,, {LS}{SCRIPT}"
cOpt_Link := '-Gn -Tpe -L"{DL}" {FL} ' + iif( hbmk[ _HBMK_lGUI ], "c0w32.obj", "c0x32.obj" ) + " {LO}, {OE}, " + iif( hbmk[ _HBMK_lMAP ], "{OM}", "nul" ) + ", {LL} cw32mt.lib import32.lib,, {LS}{SCRIPT}"
cOpt_Dyn := '-Gn -Tpd -L"{DL}" {FD} ' + "c0d32.obj" + " {LO}, {OD}, " + iif( hbmk[ _HBMK_lMAP ], "{OM}", "nul" ) + ", {LL} cw32mt.lib import32.lib,, {LS}{SCRIPT}"
cLibPathPrefix := ""
cLibPathSep := ";"
IF hbmk[ _HBMK_lGUI ]