diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e10b52c3de..fcb1042874 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +19990731-17:00 EDT Paul Tucker + * makefile.vc + * moved contents of rdd.lib into harbour.lib + * tests/working/buildvc.bat + * removed reference to rdd.lib + 19990731-22:27 GMT+1 Bruno Cantero * makefile.dos Removed target 'nat' diff --git a/harbour/makefile.vc b/harbour/makefile.vc index 31fdb1bff8..1b12cf6db3 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -42,7 +42,6 @@ HARBOUR_LIB=$(LIB_DIR)\harbour.lib TERMINAL_LIB=$(LIB_DIR)\terminal.lib TOOLS_LIB=$(LIB_DIR)\hbtools.lib HBPP_LIB=$(LIB_DIR)\hbpp.lib -RDD_LIB=$(LIB_DIR)\rdd.lib DBFNTX_LIB=$(LIB_DIR)\dbfntx.lib HARBOUR_EXE=$(BIN_DIR)\harbour.exe HARBOURFLAGS=-iinclude -n @@ -86,7 +85,8 @@ HARBOUR_LIB_OBJS = \ $(OBJ_DIR)\setcolor.obj \ $(OBJ_DIR)\strings.obj \ $(OBJ_DIR)\tclass.obj \ - $(OBJ_DIR)\transfrm.obj + $(OBJ_DIR)\transfrm.obj \ + $(RDD_OBJS) # # OBJ list for hbtools.lib. Add new ones as needed @@ -132,7 +132,7 @@ TERMINAL_LIB_OBJS = \ # OBJ list for rdds. Add new ones as needed # -RDD_LIB_OBJS = \ +RDD_OBJS = \ $(OBJ_DIR)\dbcmd.obj \ $(OBJ_DIR)\dbf0.obj \ $(OBJ_DIR)\dbf1.obj \ @@ -165,7 +165,6 @@ all: $(HARBOUR_EXE) \ $(TOOLS_LIB) \ $(TERMINAL_LIB) \ $(HBPP_LIB) \ - $(RDD_LIB) \ $(DBFNTX_LIB) $(HARBOUR_EXE) : \ @@ -200,9 +199,6 @@ $(HBPP_LIB) : $(HBPP_LIB_OBJS) $(TERMINAL_LIB) : $(TERMINAL_LIB_OBJS) lib /OUT:$(TERMINAL_LIB) $(TERMINAL_LIB_OBJS) -$(RDD_LIB) : $(RDD_LIB_OBJS) - lib /OUT:$(RDD_LIB) $(RDD_LIB_OBJS) - $(DBFNTX_LIB) : $(DBFNTX_LIB_OBJS) lib /OUT:$(DBFNTX_LIB) $(DBFNTX_LIB_OBJS) diff --git a/harbour/tests/working/buildvc.bat b/harbour/tests/working/buildvc.bat index 28a72ab801..f88837cf86 100644 --- a/harbour/tests/working/buildvc.bat +++ b/harbour/tests/working/buildvc.bat @@ -1,2 +1,2 @@ ..\..\bin\harbour %1 /n -cl -Fd..\..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_GTAPI -DHARBOUR_USE_WIN_GTAPI -I..\..\include %1.c /link /subsystem:CONSOLE ..\..\obj\symbols.obj ..\..\libs\vc\harbour.lib ..\..\libs\vc\terminal.lib ..\..\libs\vc\rdd.lib ..\..\libs\vc\hbtools.lib ..\..\libs\vc\dbfntx.lib +cl -Fd..\..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_GTAPI -DHARBOUR_USE_WIN_GTAPI -I..\..\include %1.c /link /subsystem:CONSOLE ..\..\obj\symbols.obj ..\..\libs\vc\harbour.lib ..\..\libs\vc\terminal.lib ..\..\libs\vc\hbtools.lib ..\..\libs\vc\dbfntx.lib