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

2009-04-14 15:57 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed Borland stub for both GUI and CUI mode.
      This bug surfaced now that a separate link phase is always used.
    ! Fixed handling of libpaths with '-' chars in them for bcc.
This commit is contained in:
Viktor Szakats
2009-04-14 13:57:49 +00:00
parent 97043a7868
commit 837190c19c
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -8,6 +8,12 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-04-14 15:57 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
! Fixed Borland stub for both GUI and CUI mode.
This bug surfaced now that a separate link phase is always used.
! Fixed handling of libpaths with '-' chars in them for bcc.
2009-04-14 14:29 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
* Changed to put user supplied lib to the beginning of the lib

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

@@ -1263,7 +1263,8 @@ PROCEDURE Main( ... )
s_aPRG_TODO := {}
FOR EACH tmp IN s_aPRG
IF s_lDEBUGINC
OutStd( "PRG", FN_ExtSet( tmp, ".prg" ), FN_DirExtSet( tmp, cWorkDir, ".c" ), hb_osNewLine() )
OutStd( "PRG", FN_ExtSet( tmp, ".prg" ),;
FN_DirExtSet( tmp, cWorkDir, ".c" ), hb_osNewLine() )
ENDIF
IF ! hb_FGetDateTime( FN_ExtSet( tmp, ".prg" ), @tmp1 ) .OR. ;
! hb_FGetDateTime( FN_DirExtSet( tmp, cWorkDir, ".c" ), @tmp2 ) .OR. ;
@@ -1914,7 +1915,7 @@ PROCEDURE Main( ... )
cOpt_Res := "{IR} -fo{OS}"
cResExt := ".res"
cBin_Link := "ilink32.exe"
cOpt_Link := "-Gn -C -ap -Tpe -L{DL} {FL} c0d32.obj {LO}, {OE}, " + iif( s_lMAP, "{OM}", "nul" ) + ", cw32mt.lib {LL} import32.lib,, {LS}{SCRIPT}"
cOpt_Link := '-Gn -C -ap -Tpe -L"{DL}" {FL} ' + iif( s_lGUI, "c0w32.obj", "c0x32.obj" ) + ' {LO}, {OE}, ' + iif( s_lMAP, "{OM}", "nul" ) + ", cw32mt.lib {LL} import32.lib,, {LS}{SCRIPT}"
cLibPathPrefix := ""
cLibPathSep := ";"
IF s_lINC
@@ -2396,7 +2397,8 @@ PROCEDURE Main( ... )
s_aPRG_DONE := {}
FOR EACH tmp IN s_aPRG
IF s_lDEBUGINC
OutStd( "CPRG", FN_DirExtSet( tmp, cWorkDir, ".c" ), FN_DirExtSet( tmp, cWorkDir, cObjExt ), hb_osNewLine() )
OutStd( "CPRG", FN_DirExtSet( tmp, cWorkDir, ".c" ),;
FN_DirExtSet( tmp, cWorkDir, cObjExt ), hb_osNewLine() )
ENDIF
IF ! hb_FGetDateTime( FN_DirExtSet( tmp, cWorkDir, ".c" ), @tmp1 ) .OR. ;
! hb_FGetDateTime( FN_DirExtSet( tmp, cWorkDir, cObjExt ), @tmp2 ) .OR. ;