diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 33a0652736..a66939cbf6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,15 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + +2002-12-03 22:40 UTC+0300 Alexander Kresin + * makefile.bc + * makefile.nt + * Added lines, needed for compiling of cdpla850.c + * source/codepage/cdpla850.c + * source/codepage/Makefile + ! Minor fixes + 2002-11-01 12:00 UTC-0300 Luiz Rafael Culik * source/rtl/dbsdf.prg ! fixed importing/exporting on linux diff --git a/harbour/makefile.bc b/harbour/makefile.bc index d304455430..e4057cfc3b 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -2157,6 +2157,9 @@ $(OBJ_DIR)\msgzhgb.obj : $(LANG_DIR)\msgzhgb.c # # CODEPAGE.LIB dependencies # +$(OBJ_DIR)\cdpla850.obj : $(CODEPAGE_DIR)\cdpla850.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\cdppl852.obj : $(CODEPAGE_DIR)\cdppl852.c $(CC) $(CLIBFLAGS) -o$@ $** diff --git a/harbour/makefile.nt b/harbour/makefile.nt index 95a79259ed..80f7c51fb6 100644 --- a/harbour/makefile.nt +++ b/harbour/makefile.nt @@ -482,6 +482,7 @@ LANG_LIB_OBJS = \ $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< CODEPAGE_LIB_OBJS = \ + $(OBJ_DIR)\cdpla850.obj \ $(OBJ_DIR)\cdppl852.obj \ $(OBJ_DIR)\cdppliso.obj \ $(OBJ_DIR)\cdpplmaz.obj \ diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index 2d515c4338..c21fa5f706 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -5,12 +5,12 @@ ROOT = ../../ C_SOURCES=\ + cdpla850.c \ cdppl852.c \ cdppliso.c \ cdpplmaz.c \ cdpru866.c \ cdprukoi.c \ - cdpla850.c \ cdpruwin.c LIBNAME=codepage diff --git a/harbour/source/codepage/cdpla850.c b/harbour/source/codepage/cdpla850.c index 0685ffbcb0..b8b1db1bad 100644 --- a/harbour/source/codepage/cdpla850.c +++ b/harbour/source/codepage/cdpla850.c @@ -91,6 +91,6 @@ HB_CALL_ON_STARTUP_BEGIN( hb_codepage_Init_PT ) hb_cdpRegister( &s_codepage ); HB_CALL_ON_STARTUP_END( hb_codepage_Init_PT ) #if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup hb_codepage_Init_EN + #pragma startup hb_codepage_Init_PT #endif