From 9528cb877abf13ace13d523981871b571e2b30a4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 31 Jan 2011 08:51:22 +0000 Subject: [PATCH] 2011-01-31 09:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Enabled to use link scripts with msvc compilers, to avoid too long cmdline problems. (experienced when creating qtgui lib in dynamic version (HB_BUILD_CONTRIB_DYN=yes) with HB_BUILD_NAME set to a longer name, so it was quite a stress case and should not cause a problem for most users.) --- harbour/ChangeLog | 13 ++++++++++++- harbour/utils/hbmk2/hbmk2.prg | 6 +++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3a615550bb..72bfcea76e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,10 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-31 09:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + + Enabled to use link scripts with msvc compilers, to avoid + too long cmdline problems. (experienced when creating + qtgui lib in dynamic version (HB_BUILD_CONTRIB_DYN=yes) + with HB_BUILD_NAME set to a longer name, so it was quite + a stress case and should not cause a problem for most + users.) + 2011-01-30 19:55 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/ideformat.prg ! Provided: to view formatted results of select text. - Now if "Selected Text" checkbox is checked then only + Now if "Selected Text" checkbox is checked then only selected source is supplied for the formatting. 2011-01-30 19:41 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -31,6 +40,8 @@ % Rearranged: "Format" option in editing instance's context menu. 2011-01-31 01:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * include/hbapi.h + * include/hbstack.h + Added HB_EXPORT flag to these functions: (required by xhb, hbfship) hb_stackBaseOffset() hb_stackItem() diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index de3044fe5a..7d3efa5c56 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -4096,8 +4096,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) cBin_Dyn := cBin_Link ENDIF cBin_CompCPP := cBin_CompC - cOpt_Lib := "-nologo {FA} -out:{OL} {LO}" - cOpt_Dyn := "-nologo {FD} {IM} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}" + cOpt_Lib := "-nologo {FA} -out:{OL} {LO}{SCRIPT}" + cOpt_Dyn := "-nologo {FD} {IM} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}{SCRIPT}" cOpt_CompC := "-nologo -c" cBin_LibHBX := "dumpbin.exe" cOpt_LibHBX := "-symbols {LI}" @@ -4151,7 +4151,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) 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} {IM} {LL} {LB} {LS}{SCRIPT}" SWITCH hbmk[ _HBMK_cCOMP ] CASE "msvc" ; AAdd( hbmk[ _HBMK_aOPTI ], "-machine:x86" ) ; EXIT CASE "msvc64" ; AAdd( hbmk[ _HBMK_aOPTI ], "-machine:x64" ) ; EXIT