diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 785bd128ab..dea98e4dd1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,15 @@ For example: 2002-12-01 13:30 UTC+0100 Foo Bar */ + VHM PCODE, C code, .NET code, etc. but at this moment adding support + for .c compilation directly into compiler will make the compiler code + too much complicated for me - IMHO it's better to invest time into + clear separation to FRONT_END->REAL_COMPILER->BACK_END + Please make test with your code. I rebuild whole Harbour code with + -gc3 set in HB_FLAGS in harbour/config/rules.cf and all seems to + work correctly. hbtest returns exactly the same results. + I also made tests with my programs and they work correctly but + * harbour/makefile.bc some typos in some of them which are very seldom used so your tests will be very important. diff --git a/harbour/makefile.bc b/harbour/makefile.bc index fae2f6438b..80b5edfe97 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -165,6 +165,7 @@ GTDOS_LIB = $(LIB_DIR)\gtdos.lib GTPCA_LIB = $(LIB_DIR)\gtpca.lib GTSTD_LIB = $(LIB_DIR)\gtstd.lib GTWIN_LIB = $(LIB_DIR)\gtwin.lib +GTWVT_LIB = $(LIB_DIR)\gtwvt.lib HARBOUR_EXE = $(BIN_DIR)\harbour.exe HBPP_EXE = $(BIN_DIR)\hbpp.exe @@ -200,7 +201,8 @@ HB_GT_LIBS = \ $(GTCGI_LIB) \ $(GTPCA_LIB) \ $(GTSTD_LIB) \ - $(GTWIN_LIB) + $(GTWIN_LIB) \ + $(GTWVT_LIB) !if !$d(HB_GT_LIB) HB_GT_LIB = $(GTWIN_LIB) @@ -697,6 +699,13 @@ GTSTD_LIB_OBJS = \ GTWIN_LIB_OBJS = \ $(OBJ_DIR)\gtwin.obj +# +# GTWVT.LIB rules +# + +GTWVT_LIB_OBJS = \ + $(OBJ_DIR)\gtwvt.obj + # # HARBOUR.EXE rules # @@ -856,7 +865,7 @@ $(GTDOS_LIB) : $(GTDOS_LIB_OBJS) $(GTPCA_LIB) : $(GTPCA_LIB_OBJS) $(GTSTD_LIB) : $(GTSTD_LIB_OBJS) $(GTWIN_LIB) : $(GTWIN_LIB_OBJS) - +$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) # # COMMON.LIB dependencies # @@ -2818,6 +2827,15 @@ $(OBJ_DIR)\gtwin.obj : $(RTL_DIR)\gtwin\gtwin.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(GTWIN_LIB) $(ARFLAGS) -+$@,, +# +# GTWVT.LIB dependencies +# + +$(OBJ_DIR)\gtwvt.obj : $(RTL_DIR)\gtwvt\gtwvt.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(GTWVT_LIB) $(ARFLAGS) -+$@,, + + # # HBPP.EXE dependencies # diff --git a/harbour/makefile.nt b/harbour/makefile.nt index fef0a9f660..c2e2f6a132 100644 --- a/harbour/makefile.nt +++ b/harbour/makefile.nt @@ -177,6 +177,7 @@ GTDOS_LIB = $(LIB_DIR)\gtdos.lib GTPCA_LIB = $(LIB_DIR)\gtpca.lib GTSTD_LIB = $(LIB_DIR)\gtstd.lib GTWIN_LIB = $(LIB_DIR)\gtwin.lib +GTWVT_LIB = $(LIB_DIR)\gtwvt.lib HARBOUR_EXE = $(BIN_DIR)\harbour.exe HBPP_EXE = $(BIN_DIR)\hbpp.exe @@ -196,7 +197,8 @@ HB_GT_LIBS = \ $(GTCGI_LIB) \ $(GTPCA_LIB) \ $(GTSTD_LIB) \ - $(GTWIN_LIB) + $(GTWIN_LIB) \ + $(GTWVT_LIB) !ifndef HB_GT_LIB # don't indent definitions @@ -855,6 +857,16 @@ GTSTD_LIB_OBJS = \ GTWIN_LIB_OBJS = \ $(OBJ_DIR)\gtwin.obj +# +# GTWVT.LIB rules +# + +{$(RTL_DIR)\gtwvt}.c{$(OBJ_DIR)}.obj:: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +GTWVT_LIB_OBJS = \ + $(OBJ_DIR)\gtwvt.obj + # # Our default target # @@ -1176,6 +1188,9 @@ $(GTSTD_LIB) : $(GTSTD_LIB_OBJS) $(GTWIN_LIB) : $(GTWIN_LIB_OBJS) lib /out:$@ $** +$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) + lib /out:$@ $** + $(GTDOS_LIB) : $(GTDOS_LIB_OBJS) lib /out:$@ $** @@ -1259,3 +1274,4 @@ $(GTCGI_LIB)2 : $(GTCGI_LIB_OBJS) $(GTPCA_LIB)2 : $(GTPCA_LIB_OBJS) $(GTSTD_LIB)2 : $(GTSTD_LIB_OBJS) $(GTWIN_LIB)2 : $(GTWIN_LIB_OBJS) +$(GTWVT_LIB)2 : $(GTWVT_LIB_OBJS) diff --git a/harbour/makefile.vc b/harbour/makefile.vc index e2f4ff8d21..b4f49bb52d 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -144,6 +144,7 @@ GTDOS_LIB = $(LIB_DIR)\gtdos.lib GTPCA_LIB = $(LIB_DIR)\gtpca.lib GTSTD_LIB = $(LIB_DIR)\gtstd.lib GTWIN_LIB = $(LIB_DIR)\gtwin.lib +GTWVT_LIB = $(LIB_DIR)\gtwvt.lib HARBOUR_EXE = $(BIN_DIR)\harbour.exe HBPP_EXE = $(BIN_DIR)\hbpp.exe @@ -163,7 +164,8 @@ HB_GT_LIBS = \ $(GTCGI_LIB) \ $(GTPCA_LIB) \ $(GTSTD_LIB) \ - $(GTWIN_LIB) + $(GTWIN_LIB) \ + $(GTWVT_LIB) !ifndef HB_GT_LIB # don't indent definitions @@ -809,8 +811,17 @@ GTSTD_LIB_OBJS = \ $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< GTWIN_LIB_OBJS = \ - $(OBJ_DIR)\gtwin.obj \ - $(OBJ_DIR)\mousewin.obj + $(OBJ_DIR)\gtwin.obj + +# +# GTWVT.LIB rules +# + +{$(RTL_DIR)\gtwvt}.c{$(OBJ_DIR)}.obj: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +GTWVT_LIB_OBJS = \ + $(OBJ_DIR)\gtwvt.obj # # Our default target @@ -1129,6 +1140,9 @@ $(GTSTD_LIB) : $(GTSTD_LIB_OBJS) $(GTWIN_LIB) : $(GTWIN_LIB_OBJS) lib /out:$@ $** +$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) + lib /out:$@ $** + $(GTDOS_LIB) : $(GTDOS_LIB_OBJS) lib /out:$@ $** diff --git a/harbour/makefile64.nt b/harbour/makefile64.nt index 2c131274ba..004cbf41be 100644 --- a/harbour/makefile64.nt +++ b/harbour/makefile64.nt @@ -167,6 +167,7 @@ GTDOS_LIB = $(LIB_DIR)\gtdos.lib GTPCA_LIB = $(LIB_DIR)\gtpca.lib GTSTD_LIB = $(LIB_DIR)\gtstd.lib GTWIN_LIB = $(LIB_DIR)\gtwin.lib +GTWVT_LIB = $(LIB_DIR)\gtwvt.lib HARBOUR_EXE = $(BIN_DIR)\harbour.exe HBPP_EXE = $(BIN_DIR)\hbpp.exe @@ -186,7 +187,8 @@ HB_GT_LIBS = \ $(GTCGI_LIB) \ $(GTPCA_LIB) \ $(GTSTD_LIB) \ - $(GTWIN_LIB) + $(GTWIN_LIB) \ + $(GTWVT_LIB) !ifndef HB_GT_LIB # don't indent definitions @@ -845,6 +847,17 @@ GTSTD_LIB_OBJS = \ GTWIN_LIB_OBJS = \ $(OBJ_DIR)\gtwin.obj +# +# GTWVT.LIB rules +# + +{$(RTL_DIR)\gtwvt}.c{$(OBJ_DIR)}.obj:: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +GTWIN_LIB_OBJS = \ + $(OBJ_DIR)\gtwvt.obj + + # # Our default target # @@ -1166,6 +1179,9 @@ $(GTSTD_LIB) : $(GTSTD_LIB_OBJS) $(GTWIN_LIB) : $(GTWIN_LIB_OBJS) lib /out:$@ $** +$(GTWVT_LIB) : $(GTWVT_LIB_OBJS) + lib /out:$@ $** + $(GTDOS_LIB) : $(GTDOS_LIB_OBJS) lib /out:$@ $** @@ -1249,3 +1265,4 @@ $(GTCGI_LIB)2 : $(GTCGI_LIB_OBJS) $(GTPCA_LIB)2 : $(GTPCA_LIB_OBJS) $(GTSTD_LIB)2 : $(GTSTD_LIB_OBJS) $(GTWIN_LIB)2 : $(GTWIN_LIB_OBJS) +$(GTWVT_LIB)2 : $(GTWVT_LIB_OBJS) \ No newline at end of file