From 3d17df8f03d179e06aa94a2c13a4b216187dadff Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 22 Jun 2006 15:28:01 +0000 Subject: [PATCH] 2006-06-22 17:28 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu) * harbour/makefile.bc * Updated for latest changes. --- harbour/ChangeLog | 4 ++++ harbour/makefile.bc | 30 +++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3a05f95d64..60019cd540 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ + a wrong fix back then.) + * harbour/makefile.bc + * Updated for latest changes. + * Removed one codeblock unused var warning. 2006-06-22 17:28 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu) * harbour/makefile.bc diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 8431ca5c16..7355827e09 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -167,6 +167,7 @@ GTPCA_LIB = $(LIB_DIR)\gtpca.lib GTSTD_LIB = $(LIB_DIR)\gtstd.lib GTWIN_LIB = $(LIB_DIR)\gtwin.lib GTWVT_LIB = $(LIB_DIR)\gtwvt.lib +GTGUI_LIB = $(LIB_DIR)\gtgui.lib HARBOUR_EXE = $(BIN_DIR)\harbour.exe HBPP_EXE = $(BIN_DIR)\hbpp.exe @@ -203,7 +204,8 @@ HB_GT_LIBS = \ $(GTPCA_LIB) \ $(GTSTD_LIB) \ $(GTWIN_LIB) \ - $(GTWVT_LIB) + $(GTWVT_LIB) \ + $(GTGUI_LIB) !if !$d(HB_GT_LIB) HB_GT_LIB = $(GTWIN_LIB) @@ -260,8 +262,10 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\gt.obj \ $(OBJ_DIR)\gtapi.obj \ $(OBJ_DIR)\gtapiu.obj \ + $(OBJ_DIR)\gtclip.obj \ $(OBJ_DIR)\gtfunc.obj \ $(OBJ_DIR)\gtsys.obj \ + $(OBJ_DIR)\gttone.obj \ $(OBJ_DIR)\gx.obj \ $(OBJ_DIR)\hardcr.obj \ $(OBJ_DIR)\hbffind.obj \ @@ -709,6 +713,13 @@ GTWIN_LIB_OBJS = \ GTWVT_LIB_OBJS = \ $(OBJ_DIR)\gtwvt.obj +# +# GTGUI.LIB rules +# + +GTGUI_LIB_OBJS = \ + $(OBJ_DIR)\gtgui.obj + # # HARBOUR.EXE rules # @@ -874,6 +885,7 @@ $(GTPCA_LIB) : $(GTPCA_LIB_OBJS) $(GTSTD_LIB) : $(GTSTD_LIB_OBJS) $(GTWIN_LIB) : $(GTWIN_LIB_OBJS) $(GTWVT_LIB) : $(GTWVT_LIB_OBJS) +$(GTGUI_LIB) : $(GTGUI_LIB_OBJS) # # COMMON.LIB dependencies # @@ -1634,6 +1646,10 @@ $(OBJ_DIR)\gtapiu.obj : $(RTL_DIR)\gtapiu.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\gtclip.obj : $(RTL_DIR)\gtclip.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\gtfunc.obj : $(RTL_DIR)\gtfunc.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, @@ -1642,6 +1658,10 @@ $(OBJ_DIR)\gtsys.obj : $(RTL_DIR)\gtsys.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\gttone.obj : $(RTL_DIR)\gttone.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\gx.obj : $(RTL_DIR)\gx.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, @@ -2863,6 +2883,14 @@ $(OBJ_DIR)\gtwvt.obj : $(RTL_DIR)\gtwvt\gtwvt.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(GTWVT_LIB) $(ARFLAGS) -+$@,, +# +# GTGUI.LIB dependencies +# + +$(OBJ_DIR)\gtgui.obj : $(RTL_DIR)\gtgui\gtgui.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(GTWVT_LIB) $(ARFLAGS) -+$@,, + # # HBPP.EXE dependencies