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

2010-05-20 23:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed overlook in recent modification (put .def file macros
      in normal linker command template)
    ! Fixed missing '-nologo' option in msvc -hbdyn[vm] linker 
      command template.
This commit is contained in:
Viktor Szakats
2010-05-20 21:35:20 +00:00
parent 7f803c89f0
commit 977cffcf00
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-05-20 23:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
! Fixed overlook in recent modification (put .def file macros
in normal linker command template)
! Fixed missing '-nologo' option in msvc -hbdyn[vm] linker
command template.
2010-05-20 23:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
! Fixed filter evaluation to not let envvar names colliding

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

@@ -3334,7 +3334,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
cBin_CompCPP := cBin_CompC
nCmd_Esc := _ESC_DBLQUOTE
cOpt_Lib := "-nologo {FA} -out:{OL} {LO}"
cOpt_Dyn := "{FD} {IM} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}"
cOpt_Dyn := "-nologo {FD} {IM} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}"
cOpt_CompC := "-nologo -c"
IF hbmk[ _HBMK_lOPTIM ]
IF hbmk[ _HBMK_cPLAT ] == "wce"
@@ -3385,7 +3385,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
ENDIF
cOpt_CompC += " {FC} {LC}"
cOptIncMask := "-I{DI}"
cOpt_Link := "-nologo -out:{OE} {LO} {DL} {FL} {IM} {LL} {LB} {LS}"
cOpt_Link := "-nologo -out:{OE} {LO} {DL} {FL} {LL} {LB} {LS}"
SWITCH hbmk[ _HBMK_cCOMP ]
CASE "msvc" ; AAdd( hbmk[ _HBMK_aOPTI ], "-machine:x86" ) ; EXIT
CASE "msvc64" ; AAdd( hbmk[ _HBMK_aOPTI ], "-machine:x64" ) ; EXIT
@@ -3544,7 +3544,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF hbmk[ _HBMK_lMT ]
AAdd( hbmk[ _HBMK_aOPTC ], "-MT" )
ENDIF
cOpt_Link := "-out:{OE} {LO} {DL} {FL} {IM} {LL} {LB} {LS}"
cOpt_Link := "-out:{OE} {LO} {DL} {FL} {LL} {LB} {LS}"
cLibPathPrefix := "-libpath:"
cLibPathSep := " "
cDynDefPrefix := "-def:"