From 8d60dc359c748715188bfe761333cbc925d742c5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 13 May 2009 23:06:37 +0000 Subject: [PATCH] 2009-05-14 01:05 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Fixed -map for msvc compilers. (regression since splitting compile/link phase) --- harbour/ChangeLog | 5 +++++ harbour/utils/hbmk2/hbmk2.prg | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 57faceca45..d57f23f429 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-14 01:05 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + ! Fixed -map for msvc compilers. + (regression since splitting compile/link phase) + 2009-05-14 00:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/rddads/ads1.c ! added workaround for ACE bug: character fields longer then 23 bytes are diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 20b87021ec..5085241484 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -95,6 +95,7 @@ /* TODO: Further clean hbmk context var usage (hbmk2 scope, project scope, adding rest of variables). */ /* TODO: Finish C++/C mode selection. */ +/* TODO: Incremental .pot to .po merge. */ /* TODO: Add a way to fallback to stop if required headers couldn't be found. This needs a way to spec what key headers to look for. */ @@ -2300,8 +2301,8 @@ FUNCTION hbmk( aArgs ) cLibPathPrefix := "/libpath:" cLibPathSep := " " IF hbmk[ _HBMK_lMAP ] - AAdd( hbmk[ _HBMK_aOPTC ], "-Fm" ) - AAdd( hbmk[ _HBMK_aOPTD ], "-Fm" ) + AAdd( hbmk[ _HBMK_aOPTL ], "/map" ) + AAdd( hbmk[ _HBMK_aOPTD ], "/map" ) ENDIF IF hbmk[ _HBMK_cCOMP ] == "msvcarm" /* NOTE: Copied from .cf. Probably needs cleaning. */