diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6de74fdc78..53f7015b4b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,19 @@ +2001-11-07 14:55 UTC+0100 Viktor Szakats + + * source/lang/Makefile + * makefile.bc + * makefile.vc + * Updated with new lang modules. + Now only Chinese and Dutch modules are not converted, if anyone + feel like doing, please do. + + * make_vc.bat + - Removed the call to create libmisc. If you need this, please + make a batch file and set it locally. + + * source/rtl/oldbox.c + * Some indentation. + 2001-11-07 16:10 GMT+3 Alexander Kresin * source/lang/msgru866.c * source/lang/msgruwin.c diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index 6d211f7cef..9b6111464b 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -18,10 +18,6 @@ if "%1" == "CLEAN" goto CLEAN nmake /f makefile.vc %1 %2 %3 > make_vc.log if errorlevel 1 goto BUILD_ERR - cd contrib\libmisc - nmake /f makefile.vc %1 %2 %3 >> make_vc.log - if errorlevel 1 goto BUILD_ERR - cd..\.. :BUILD_OK diff --git a/harbour/makefile.bc b/harbour/makefile.bc index a0f2e333b1..0508279cf4 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -400,6 +400,8 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgplmaz.obj \ $(OBJ_DIR)\msgpt.obj \ $(OBJ_DIR)\msgro.obj \ + $(OBJ_DIR)\msgru866.obj \ + $(OBJ_DIR)\msgruwin.obj \ $(OBJ_DIR)\msgsr852.obj \ $(OBJ_DIR)\msgsriso.obj @@ -2062,6 +2064,14 @@ $(OBJ_DIR)\msgro.obj : $(LANG_DIR)\msgro.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\msgru866.obj : $(LANG_DIR)\msgru866.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\msgruwin.obj : $(LANG_DIR)\msgruwin.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\msgsr852.obj : $(LANG_DIR)\msgsr852.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, diff --git a/harbour/makefile.vc b/harbour/makefile.vc index c36093415e..2bd2fcfdde 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -447,6 +447,8 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgplmaz.obj \ $(OBJ_DIR)\msgpt.obj \ $(OBJ_DIR)\msgro.obj \ + $(OBJ_DIR)\msgru866.obj \ + $(OBJ_DIR)\msgruwin.obj \ $(OBJ_DIR)\msgsr852.obj \ $(OBJ_DIR)\msgsriso.obj diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile index 57cac459ff..6b97cba17c 100644 --- a/harbour/source/lang/Makefile +++ b/harbour/source/lang/Makefile @@ -33,6 +33,8 @@ C_SOURCES=\ msgplmaz.c \ msgpt.c \ msgro.c \ + msgru866.c \ + msgruwin.c \ msgsr852.c \ msgsriso.c \ diff --git a/harbour/source/rtl/oldbox.c b/harbour/source/rtl/oldbox.c index 2df732286c..7909a649a6 100644 --- a/harbour/source/rtl/oldbox.c +++ b/harbour/source/rtl/oldbox.c @@ -64,11 +64,11 @@ HB_FUNC( __BOX ) PHB_ITEM pRight = hb_param( 4, HB_IT_NUMERIC ); if( pTop && pLeft && pBottom && pRight ) - hb_gtBox( hb_itemGetNI( pTop ), - hb_itemGetNI( pLeft), - hb_itemGetNI( pBottom ), - hb_itemGetNI( pRight ), - ( BYTE * ) ( ISCHAR( 5 ) ? hb_parc( 5 ) : " " ) ); + hb_gtBox( hb_itemGetNI( pTop ), + hb_itemGetNI( pLeft), + hb_itemGetNI( pBottom ), + hb_itemGetNI( pRight ), + ( BYTE * ) ( ISCHAR( 5 ) ? hb_parc( 5 ) : " " ) ); } HB_FUNC( __BOXD ) @@ -79,10 +79,10 @@ HB_FUNC( __BOXD ) PHB_ITEM pRight = hb_param( 4, HB_IT_NUMERIC ); if( pTop && pLeft && pBottom && pRight ) - hb_gtBoxD( hb_itemGetNI( pTop ), - hb_itemGetNI( pLeft), - hb_itemGetNI( pBottom ), - hb_itemGetNI( pRight ) ); + hb_gtBoxD( hb_itemGetNI( pTop ), + hb_itemGetNI( pLeft), + hb_itemGetNI( pBottom ), + hb_itemGetNI( pRight ) ); } HB_FUNC( __BOXS ) @@ -92,11 +92,11 @@ HB_FUNC( __BOXS ) PHB_ITEM pBottom = hb_param( 3, HB_IT_NUMERIC ); PHB_ITEM pRight = hb_param( 4, HB_IT_NUMERIC ); - if( pTop && pLeft && pBottom && pRight ) - hb_gtBoxS( hb_itemGetNI( pTop ), - hb_itemGetNI( pLeft), - hb_itemGetNI( pBottom ), - hb_itemGetNI( pRight ) ); + if( pTop && pLeft && pBottom && pRight ) + hb_gtBoxS( hb_itemGetNI( pTop ), + hb_itemGetNI( pLeft), + hb_itemGetNI( pBottom ), + hb_itemGetNI( pRight ) ); } #endif