From 5e744ca9e4bbb334910568868afaa1dff1206f4c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 17 Mar 2009 23:52:46 +0000 Subject: [PATCH] 2009-03-18 00:50 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg + Added support for -o for executables in win/pocc. --- harbour/ChangeLog | 8 ++++++-- harbour/utils/hbmk2/hbmk2.prg | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 69a8abd515..0d3dd61c22 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,16 +8,20 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-18 00:50 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + + Added support for -o for executables in win/pocc. + 2009-03-18 00:50 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbatomic.h % removed unnecessary in such version xor - + 2009-03-18 00:49 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbatomic.h + added atomic inc/dec inline assembler code for 32bit MSVC builds and probably also to other compilers which defines _MSC_VER macro (XCC/POCC). Thanks to Viktor for help. Please make some tests. - + * harbour/source/compiler/hbopt.c ! disabled one assert() in PCODE optimization code. Mindaugas, I left note which explains why. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 650510fa5f..b6e8429af4 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1705,6 +1705,8 @@ FUNCTION Main( ... ) IF ( Len( s_aPRG ) + Len( s_aC ) ) == 1 AAdd( s_aOPTC, "/Fo{OO}" ) ENDIF + ELSE + AAdd( s_aOPTL, "/out:{OE}" ) ENDIF cOpt_Link := "{LO} {DL} {FL} {LL} {LS}" cLibPathPrefix := "/libpath:"