From 47b082cb2e7c216fa4c1dd47e1e90267e9300d31 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Thu, 1 May 2003 10:23:15 +0000 Subject: [PATCH] updated for cdpesdos.c, cdpeswin.c and msgeswin.c --- harbour/makefile.bc | 17 ++++++++++++++++- harbour/makefile.nt | 4 +++- harbour/makefile.vc | 7 +++++-- harbour/source/codepage/Makefile | 8 +++++--- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 2e2aaf2c97..b6451dd06b 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -394,6 +394,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msgeo.obj \ $(OBJ_DIR)\msges.obj \ + $(OBJ_DIR)\msgeswin.obj \ $(OBJ_DIR)\msgeu.obj \ $(OBJ_DIR)\msgfr.obj \ $(OBJ_DIR)\msggl.obj \ @@ -422,6 +423,8 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgzhb5.obj CODEPAGE_LIB_OBJS = \ + $(OBJ_DIR)\cdpesdos.obj \ + $(OBJ_DIR)\cdpeswin.obj \ $(OBJ_DIR)\cdpgedos.obj \ $(OBJ_DIR)\cdpgewin.obj \ $(OBJ_DIR)\cdpla850.obj \ @@ -2057,6 +2060,10 @@ $(OBJ_DIR)\msges.obj : $(LANG_DIR)\msges.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\msgeswin.obj : $(LANG_DIR)\msgeswin.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(LANG_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\msgeu.obj : $(LANG_DIR)\msgeu.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(LANG_LIB) $(ARFLAGS) -+$@,, @@ -2164,6 +2171,14 @@ $(OBJ_DIR)\msgzhgb.obj : $(LANG_DIR)\msgzhgb.c # # CODEPAGE.LIB dependencies # +$(OBJ_DIR)\cdpesdos.obj : $(CODEPAGE_DIR)\cdpesdos.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\cdpeswin.obj : $(CODEPAGE_DIR)\cdpeswin.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\cdpgedos.obj : $(CODEPAGE_DIR)\cdpgedos.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(CODEPAGE_LIB) $(ARFLAGS) -+$@,, @@ -2791,4 +2806,4 @@ $(OBJ_DIR)\prb_stak.obj : $(OBJ_DIR)\prb_stak.c $(CC) $(CLIBFLAGS) -o$@ $** $(OBJ_DIR)\hbmlang.obj : $(HBMAKE_DIR)\hbmlang.c - $(CC) $(CLIBFLAGS) -o$@ $** + $(CC) $(CLIBFLAGS) -o$@ $** \ No newline at end of file diff --git a/harbour/makefile.nt b/harbour/makefile.nt index cfd4cf9fdb..f73281868a 100644 --- a/harbour/makefile.nt +++ b/harbour/makefile.nt @@ -448,6 +448,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msgeo.obj \ $(OBJ_DIR)\msges.obj \ + $(OBJ_DIR)\msgeswin.obj \ $(OBJ_DIR)\msgeu.obj \ $(OBJ_DIR)\msgfr.obj \ $(OBJ_DIR)\msggl.obj \ @@ -483,6 +484,8 @@ LANG_LIB_OBJS = \ $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< CODEPAGE_LIB_OBJS = \ + $(OBJ_DIR)\cdpesdos.obj \ + $(OBJ_DIR)\cdpeswin.obj \ $(OBJ_DIR)\cdpgedos.obj \ $(OBJ_DIR)\cdpgewin.obj \ $(OBJ_DIR)\cdpla850.obj \ @@ -1120,4 +1123,3 @@ $(GTCGI_LIB)2 : $(GTCGI_LIB_OBJS) $(GTPCA_LIB)2 : $(GTPCA_LIB_OBJS) $(GTSTD_LIB)2 : $(GTSTD_LIB_OBJS) $(GTWIN_LIB)2 : $(GTWIN_LIB_OBJS) - diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 946d0cfce7..8f095e7569 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -1,4 +1,4 @@ -# +# # $Id$ # @@ -412,6 +412,7 @@ LANG_LIB_OBJS = \ $(OBJ_DIR)\msgen.obj \ $(OBJ_DIR)\msgeo.obj \ $(OBJ_DIR)\msges.obj \ + $(OBJ_DIR)\msgeswin.obj \ $(OBJ_DIR)\msgeu.obj \ $(OBJ_DIR)\msgfr.obj \ $(OBJ_DIR)\msggl.obj \ @@ -447,6 +448,8 @@ LANG_LIB_OBJS = \ $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< CODEPAGE_LIB_OBJS = \ + $(OBJ_DIR)\cdpesdos.obj \ + $(OBJ_DIR)\cdpeswin.obj \ $(OBJ_DIR)\cdpgedos.obj \ $(OBJ_DIR)\cdpgewin.obj \ $(OBJ_DIR)\cdpla850.obj \ @@ -1064,4 +1067,4 @@ $(OBJ_DIR)\macrol.obj : $(OBJ_DIR)\macrol.c $(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -W3 -Fo$@ $** -$(DEL) $(OBJ_DIR)\unistd.h -!endif +!endif \ No newline at end of file diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile index d5a540cd63..c958fb65c4 100644 --- a/harbour/source/codepage/Makefile +++ b/harbour/source/codepage/Makefile @@ -5,7 +5,9 @@ ROOT = ../../ C_SOURCES=\ - cdpgedos.c \ + cdpesdos.c \ + cdpeswin.c \ + cdpgedos.c \ cdpgewin.c \ cdpla850.c \ cdppl852.c \ @@ -14,7 +16,7 @@ C_SOURCES=\ cdpru866.c \ cdprukoi.c \ cdpruwin.c - + LIBNAME=codepage -include $(TOP)$(ROOT)config/lib.cf +include $(TOP)$(ROOT)config/lib.cf \ No newline at end of file