diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4b7a0c9def..4ce0bd5d3c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,20 @@ +2001-12-08 06:15 GMT+0700 Andi Jahja + * makefile.bc + - removed borinit.obj dependency + - removed symbols.obj dependency + - removed borsym.obj dependency + - remed startup.obj + Notes: Have made quite a number of tests and it seems that these + modules are not needed. + + * makefile.vc + - removed symbols.obj dependency + Notes: Have made quite a number of tests and it seems that this + module is not needed. + + * contrib/libct/files.c + ! dir.h not used when _MSC_VER ( MsVC has no dir.h ) + 2001-12-08 16:20 GMT-3 Luiz Rafael Culik * source/rtl/checkbox.prg * fixed an smallbug on isdefcolor() function diff --git a/harbour/contrib/libct/files.c b/harbour/contrib/libct/files.c index 96fc78c560..7ddd131ad5 100644 --- a/harbour/contrib/libct/files.c +++ b/harbour/contrib/libct/files.c @@ -54,7 +54,7 @@ #define HB_OS_WIN_32_USED #include -#if defined(HB_OS_DOS) +#if defined(HB_OS_DOS) static struct ffblk fsOldFiles; #endif #if defined(HB_OS_OS2) && defined(__GNUC__) @@ -70,8 +70,8 @@ static struct ffblk fsOldFiles; #elif defined(HB_OS_DOS) - #if defined(__DJGPP__) || defined(__RSX32__) - #include + #if defined(__DJGPP__) || defined(__RSX32__) + #include #endif #include "hb_io.h" #include "dos.h" @@ -94,7 +94,9 @@ static HANDLE hLastFind; static WIN32_FIND_DATA Lastff32; LPTSTR GetDate(FILETIME *rTime); LPTSTR GetTime(FILETIME *rTime); -#include +#if !defined(_MSC_VER) + #include +#endif #endif #if !defined(FA_ARCH) diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 1f530d2485..0f164b5154 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -541,16 +541,12 @@ VM_LIB_OBJS = \ $(OBJ_DIR)\pvalue.obj \ $(OBJ_DIR)\runner.obj \ \ - $(OBJ_DIR)\borinit.obj \ - $(OBJ_DIR)\borsym.obj \ - $(OBJ_DIR)\symbols.obj \ - \ $(OBJ_DIR)\harbinit.obj -!if ! $d(BCC_NOSTARTUP) -VM_LIB_OBJS = $(VM_LIB_OBJS) \ - $(OBJ_DIR)\startup.obj -!endif +#!if ! $d(BCC_NOSTARTUP) +#VM_LIB_OBJS = $(VM_LIB_OBJS) \ +# $(OBJ_DIR)\startup.obj +#!endif # # GTCGI.LIB rules diff --git a/harbour/makefile.vc b/harbour/makefile.vc index f52fd6cb8d..8c6ac34dd5 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -655,17 +655,8 @@ VM_LIB_OBJS = \ $(OBJ_DIR)\pvalue.obj \ $(OBJ_DIR)\runner.obj \ \ - \ - \ - $(OBJ_DIR)\symbols.obj \ - \ $(OBJ_DIR)\harbinit.obj - - - - - # # GTCGI.LIB rules #