From 09b8a1ef638632e4a59e029290ba8e1e68542aff Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 25 Apr 2011 21:06:49 +0000 Subject: [PATCH] 2011-04-25 23:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + show CCPREFIX/CCPOSTFIX with -info * ChangeLog * some followups and typo fixes. --- harbour/ChangeLog | 15 ++++++++++++--- harbour/utils/hbmk2/hbmk2.prg | 7 ++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5681b59215..179febfb23 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-25 23:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + + show CCPREFIX/CCPOSTFIX with -info + * ChangeLog + * some followups and typo fixes. + 2011-04-25 22:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbct/hbct.hbp * raise c dialect to gnu90 on linux for stime() @@ -46,7 +52,7 @@ build passes + contrib/hbqt/qtsql/doc/en - ! add missing dir causing doc gen errors + ! added missing dir causing doc gen errors * contrib/hbmlzo/3rd/minilzo/README.LZO * contrib/hbmlzo/3rd/minilzo/lzoconf.h @@ -58,7 +64,7 @@ + update to 2.05 [Tamas Tevesz] * contrib/hbqt/qtsql/hbqtsql.hbc - ! deleted GUI related settingd + ! deleted GUI related settings * contrib/hbqt/qtsql/qth/filelist.hbm * sorted @@ -139,6 +145,8 @@ OS installations. Maybe this will work better. If not, even this will be deleted. Then maybe software/DC double-buffering will be the ultimate soltion. + [RESULT: Yes it works better and removed flickering on at + least one sampled system. - vszakats] % Dropped fiddling with SetLayeredWindowAttributes() call. * Formatting. % Deleted CS_HREDRAW | CS_VREDRAW flags from Harbour window @@ -152,8 +160,9 @@ * contrib/3rd/sqlite3/sqlite3.hbp ! Added workaround for gcc/mingw bug in 4.5.0 and 4.5.1 - revisions where it shows compile error when iso89 c dialect + versions, where it shows compile error when iso89 c dialect is selected. Now in 4.5.x gnu89 is used instead to avoid it. + Problem is also fixed in 4.5.2. * contrib/hbplist - Disabled gtwvg due to build breakage. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index f230117f66..bea9cfe4bb 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1901,7 +1901,12 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF hbmk[ _HBMK_lInfo ] hbmk_OutStd( hbmk, hb_StrFormat( I_( "Using Harbour: %1$s %2$s %3$s %4$s" ), l_cHB_INSTALL_BIN, l_cHB_INSTALL_INC, l_cHB_INSTALL_LIB, l_cHB_INSTALL_DYN ) ) IF ! Empty( cPath_CompC ) - hbmk_OutStd( hbmk, hb_StrFormat( I_( "Using C compiler: %1$s" ), cPath_CompC ) ) + IF Empty( hbmk[ _HBMK_cCCPREFIX ] ) .AND. ; + Empty( hbmk[ _HBMK_cCCPOSTFIX ] ) + hbmk_OutStd( hbmk, hb_StrFormat( I_( "Using C compiler: %1$s" ), cPath_CompC ) ) + ELSE + hbmk_OutStd( hbmk, hb_StrFormat( I_( "Using C compiler: %1$s [%2$s...%3$s]" ), cPath_CompC, hbmk[ _HBMK_cCCPREFIX ], hbmk[ _HBMK_cCCPOSTFIX ] ) ) + ENDIF ENDIF ENDIF