From 2139a48e6015a2b56b131f609bb7a46023cb5dad Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 6 Apr 2009 21:12:24 +0000 Subject: [PATCH] 2009-04-06 22:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Adding hbmainstd/hbmainwin libs as object for win/owatcom. This fixes the startup procedure problems. Thanks Przemek. --- harbour/ChangeLog | 11 ++++++++--- harbour/utils/hbmk2/hbmk2.prg | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7f723895f1..f9d1f3c2f7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-06 22:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + ! Adding hbmainstd/hbmainwin libs as object for win/owatcom. + This fixes the startup procedure problems. Thanks Przemek. + 2009-04-06 22:16 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/harbour-wce-spec ! fixed MinGWCE cross compilation for Pocket PC by simple removing @@ -40,9 +45,9 @@ 2009-04-06 19:35 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/source/rtl/hbstrfmt.c + added precision support for %s and %d. - COMMENT: I've used GNU printf() function for test. Some of - formats is not supported by it. For example, zero padding is - ignored if left alignment is used, etc. I'm not sure if it is + COMMENT: I've used GNU printf() function for test. Some of + formats is not supported by it. For example, zero padding is + ignored if left alignment is used, etc. I'm not sure if it is intentional. 2009-04-06 18:12 UTC+0200 Viktor Szakats (harbour.01 syenar hu) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index bb2017d3f3..3fdbb0e5cb 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1630,9 +1630,9 @@ FUNCTION Main( ... ) ENDIF s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } ) s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter,; - "harbour-" + cDL_Version_Alter ),; - "hbmainstd",; - "hbmainwin" } + "harbour-" + cDL_Version_Alter ) } + + AAdd( s_aOPTL, "FILE " + FN_ExtSet( s_cHB_LIB_INSTALL + hb_osPathSeparator() + iif( s_lGUI, "hbmainwin", "hbmainstd" ), cLibExt ) ) IF Len( s_aRESSRC ) > 0 IF Len( s_aRESSRC ) == 1