diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 98aa14486e..e27948cf4c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,25 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-07 15:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbgtwvg/Makefile + * contrib/hbgtwvg/common.mak + - contrib/hbgtwvg/gtwvt.h + + contrib/hbgtwvg/gtwvg.h + - contrib/hbgtwvg/gtwvt.c + + contrib/hbgtwvg/gtwvg.c + * contrib/hbgtwvg/wvtutils.c + * contrib/hbgtwvg/wvtcore.c + ! Renamed gtwvt to gtwvg to avoid clash with + gtwvt in core when using non-GNU make files. + + * source/vm/extend.c + ! Fixed trace messages in hb_parcx() + + * utils/hbmake/hbmutils.prg + ! Fixed cosmetic problem. + (Thanks to Bill Robertson) + 2007-12-07 11:39 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/gtwvt/gtwvt.h * harbour/source/rtl/gtwvt/gtwvt.c diff --git a/harbour/contrib/hbgtwvg/Makefile b/harbour/contrib/hbgtwvg/Makefile index a8754dce6a..389de68435 100644 --- a/harbour/contrib/hbgtwvg/Makefile +++ b/harbour/contrib/hbgtwvg/Makefile @@ -5,12 +5,12 @@ ROOT = ../../ C_SOURCES=\ - gtwvt.c \ + gtwvg.c \ wvtcore.c \ wvtutils.c \ C_HEADERS=\ - gtwvt.h \ + gtwvg.h \ PRG_SOURCES=\ wvtclass.prg \ diff --git a/harbour/contrib/hbgtwvg/common.mak b/harbour/contrib/hbgtwvg/common.mak index 03edd51258..e1a8acedc9 100644 --- a/harbour/contrib/hbgtwvg/common.mak +++ b/harbour/contrib/hbgtwvg/common.mak @@ -6,15 +6,17 @@ LIBNAME = hbgtwvg LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) -# -# LIB rules -# +C_HEADERS=\ + gtwvg.h \ + +PRG_HEADERS=\ + wvtwin.ch \ LIB_OBJS = \ $(OBJ_DIR)\wvtclass$(OBJEXT) \ $(OBJ_DIR)\wvtpaint$(OBJEXT) \ \ - $(OBJ_DIR)\gtwvt$(OBJEXT) \ + $(OBJ_DIR)\gtwvg$(OBJEXT) \ $(OBJ_DIR)\wvtcore$(OBJEXT) \ $(OBJ_DIR)\wvtutils$(OBJEXT) \ diff --git a/harbour/contrib/hbgtwvg/gtwvt.c b/harbour/contrib/hbgtwvg/gtwvg.c similarity index 99% rename from harbour/contrib/hbgtwvg/gtwvt.c rename to harbour/contrib/hbgtwvg/gtwvg.c index 19d1c399a5..7c30d0587b 100644 --- a/harbour/contrib/hbgtwvg/gtwvt.c +++ b/harbour/contrib/hbgtwvg/gtwvg.c @@ -84,7 +84,7 @@ #define HB_OS_WIN_32_USED -#include "gtwvt.h" +#include "gtwvg.h" static int s_GtId; static HB_GT_FUNCS SuperTable; diff --git a/harbour/contrib/hbgtwvg/gtwvt.h b/harbour/contrib/hbgtwvg/gtwvg.h similarity index 100% rename from harbour/contrib/hbgtwvg/gtwvt.h rename to harbour/contrib/hbgtwvg/gtwvg.h diff --git a/harbour/contrib/hbgtwvg/wvtcore.c b/harbour/contrib/hbgtwvg/wvtcore.c index b5a4cb6b70..0926965212 100644 --- a/harbour/contrib/hbgtwvg/wvtcore.c +++ b/harbour/contrib/hbgtwvg/wvtcore.c @@ -78,7 +78,7 @@ //-------------------------------------------------------------------// -#include "gtwvt.h" +#include "gtwvg.h" static GLOBAL_DATA *_s = NULL; diff --git a/harbour/contrib/hbgtwvg/wvtutils.c b/harbour/contrib/hbgtwvg/wvtutils.c index e454da2ba5..f6c768fd17 100644 --- a/harbour/contrib/hbgtwvg/wvtutils.c +++ b/harbour/contrib/hbgtwvg/wvtutils.c @@ -70,7 +70,7 @@ //-------------------------------------------------------------------// -#include "gtwvt.h" +#include "gtwvg.h" /* workaround for missing declaration in MinGW32 */ #if !defined(TTM_SETTITLE) && defined(TTM_SETTITLEA) diff --git a/harbour/source/vm/extend.c b/harbour/source/vm/extend.c index 7a10cb5ed0..51d62020de 100644 --- a/harbour/source/vm/extend.c +++ b/harbour/source/vm/extend.c @@ -189,7 +189,7 @@ HB_EXPORT char * hb_parc( int iParam, ... ) HB_EXPORT char * hb_parcx( int iParam, ... ) { - HB_TRACE(HB_TR_DEBUG, ("hb_parc(%d, ...)", iParam)); + HB_TRACE(HB_TR_DEBUG, ("hb_parcx(%d, ...)", iParam)); if( iParam >= -1 && iParam <= hb_pcount() ) { diff --git a/harbour/utils/hbmake/hbmutils.prg b/harbour/utils/hbmake/hbmutils.prg index 8bd828ad43..ca5866af36 100644 --- a/harbour/utils/hbmake/hbmutils.prg +++ b/harbour/utils/hbmake/hbmutils.prg @@ -601,18 +601,18 @@ FUNCTION GetLibs( lGcc, cDir ) LOCAL aInstaledLibs := GetInstaledLibs( IIF( ! lLinux, IIF( ! lGcc, cDir + "\*.lib", cDir + "\*.a" ), '/usr/lib/harbour/*.a' ), lGcc ) LOCAL cExt := iif(lGcc,".a",".lib") - - LOCAL aLibsDesc := { { "Harbour hbmisc lib - hbmisc" + cExt , 'hbmisc' + cExt },; - { "Harbour NanFor lib - hbnf" + cExt , 'hbnf' + cExt },; - { "Harbour GT lib - hbgt"+cExt , 'hbgt' + cExt },; - { "Harbour Zip lib - hbziparch"+cExt , 'hbziparch' + cExt + iif( lLinux, ' stdc++.a z.a', ' ' ) },; - { "Harbour Ole lib - hbole"+ cExt , 'hbole' + cExt + ' ole2' + cExt },; - { "Harbour MySql lib - hbmysql" + cExt , 'hbmysql' + cExt },; - { "Harbour PostGreSql lib - hbpgsql"+cExt , 'hbpgsql' + cExt },; - { "Harbour Samples lib - hbclipsm"+cExt , 'hbclipsm' + cExt } } + /* 1234567890123456789 */ + LOCAL aLibsDesc := { { "Harbour hbmisc lib - hbmisc" + cExt , 'hbmisc' + cExt },; + { "Harbour NanFor Lib lib - hbnf" + cExt , 'hbnf' + cExt },; + { "Harbour GT Lib lib - hbgt"+cExt , 'hbgt' + cExt },; + { "Harbour ZipArch lib - hbziparch"+cExt , 'hbziparch' + cExt + iif( lLinux, ' stdc++.a z.a', ' ' ) },; + { "Harbour ole (old) lib - hbole"+ cExt , 'hbole' + cExt + ' ole2' + cExt },; + { "Harbour MySQL lib - hbmysql" + cExt , 'hbmysql' + cExt },; + { "Harbour PostgreSQL lib - hbpgsql"+cExt , 'hbpgsql' + cExt },; + { "Harbour samples lib - hbclipsm"+cExt , 'hbclipsm' + cExt } } - AEVAL( aInstaledLibs, { | x | AAdd( aLibsDesc, { padr("Harbour contrib",20)+"lib - " + padr(x,15), x } ) } ) + AEVAL( aInstaledLibs, { | x | AAdd( aLibsDesc, { padr("Harbour contrib",19)+" lib - " + padr(x,15), x } ) } ) RETURN aLibsDesc