From 47a17d7ece9fc2030ae50ece755eafb078bf04bd Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 10 Apr 2000 22:33:43 +0000 Subject: [PATCH] 20000411-00:24 GMT+1 Victor Szakats --- harbour/ChangeLog | 84 +++++ harbour/bin/bld.bat | 26 +- harbour/bin/bld.cmd | 26 +- harbour/bin/bld.sh | 28 +- harbour/config/dos/djgpp.cf | 21 +- harbour/config/dos/global.cf | 14 +- harbour/config/dos/rsx32.cf | 69 ++++ harbour/config/os2/gcc.cf | 5 +- harbour/config/w32/rsxnt.cf | 72 ++++ harbour/include/hbapi.h | 1 + harbour/include/hbdefs.h | 23 +- harbour/include/hbsetup.h | 19 +- harbour/make_gnu.bat | 24 +- harbour/make_gnu.cmd | 24 +- harbour/make_gnu.sh | 24 +- harbour/makefile.bc | 492 ++++++++++++++-------------- harbour/source/common/hbver.c | 85 +++-- harbour/source/pp/ppcore.c | 2 +- harbour/source/rtl/dateshb.c | 3 - harbour/source/rtl/diskspac.c | 105 +++--- harbour/source/rtl/filesys.c | 67 ++-- harbour/source/rtl/gtdos/gtdos.c | 297 ++++++----------- harbour/source/rtl/gtdos/mousedos.c | 106 ++---- harbour/source/rtl/gtwin/gtwin.c | 15 + harbour/source/rtl/inkey.c | 88 ++--- harbour/source/rtl/is.c | 8 +- harbour/source/rtl/isprint.c | 33 +- harbour/source/rtl/transfrm.c | 6 +- harbour/source/rtl/version.c | 16 - harbour/source/vm/extend.c | 10 + harbour/source/vm/fm.c | 2 + harbour/source/vm/maindll.c | 5 +- harbour/source/vm/mainwin.c | 5 +- harbour/tests/version.prg | 1 - harbour/utils/hbtest/hbtest.prg | 10 +- 35 files changed, 939 insertions(+), 877 deletions(-) create mode 100644 harbour/config/dos/rsx32.cf create mode 100644 harbour/config/w32/rsxnt.cf diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 108fa7be74..368d44331f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,87 @@ +20000411-00:24 GMT+1 Victor Szakats + + ; Please retest Harbour on every possible platform. + + * make_gnu.* + * bin/bld.* + * Added RSX32 and RSXNT + + * makefile.bc + + $(ARFLAGS) added. + + /P32 added for BCC32, to avoid overflowing libs when compiling with + debug info. + + + config/dos/rsx32.cf + * include/hbsetup.h + * source/common/hbver.c + * source/rtl/gtdos/gtdos.c + * source/rtl/gtdos/mousedos.c + + Added support for the RSXNT compiler under DOS 32 bit. + Harbour executable don't run yet. + + DISKSPACE() for DOS now uses INT_86 instead of the less-portable + library call. + ! GTDOS and MOUSEDOS use the standard INT86, so they should work on + more platforms now, easier to extend and much more clear. + + + config/w32/rsxnt.cf + * include/hbsetup.h + * source/common/hbver.c + * source/rtl/diskspac.c + * source/rtl/gtwin/gtwin.c + + Added support for the RSXNT compiler under Windows NT. + + * source/common/hbver.c + * source/rtl/is.c + * source/rtl/transfrm.c + * source/pp/ppcore.c + * source/vm/fm.c + ! Fixed warnings for GCC -O2 and the new RSX compiler. + ! Fixed warning for turned off HB_FM_STATISTICS + + * source/vm/extend.c + * include/hbapi.h + + hb_retd() function added. Thanks to Jose Lalin. + + * include/hbdefs.h + * source/common/hbver.c + * source/rtl/isprint.c + * source/rtl/inkey.c + * source/rtl/dateshb.c + * source/rtl/gtdos/gtdos.c + * source/vm/mainwin.c + * source/vm/maindll.c + % Cleaned up the multiplatform code. (mainly for DOS (INT_86)). + + Added common HB_DOS_INT86 macro to the central header, local + declarations removed. + % Removed the branches where the word registers were accessed via "w". + "x" is supported by __BORLANDC__, __DJGPP__, _MSC_VER, __RSX32__, + __WATCOM__, __TURBOC__ (9.5). Who's missing ? + + * source/common/hbver.c + + Shows DJGPP package version. + + * source/rtl/filesys.c + + TOFIX added for hb_fsFile() + + * config/dos/global.cf + ! Got rid of the \ to / conversion for rsx32, watcom and djgpp + + * config/dos/djgpp.cf + ! Modified to avoid long command lines when linking. + I finally found a way to build DJGPP under W2K, using the MAKE.EXE + supplied with RSXNT. + + * config/os2/gcc.cf + * include/hbsetup.h + - The -DHARBOUR_GCC_OS2 detection made automatic. + + * source/rtl/version.c + * tests/version.prg + * utils/hbtest/hbtest.prg + * VERSION() no longer has the parameter extension to make things + more straight. One can use HB_COMPILER() to retrieve this info. + ! WARNING ! Please update the docs. + 20000410-09:00 Luiz Rafael Culik > __lib__.tmp @@ -59,8 +55,23 @@ echo END >> __lib__.tmp $(AR) -M < __lib__.tmp endef +# NOTE: The empty line below HAVE TO exist! +define link_file +echo $(file) >> __link__.tmp + +endef + +define link_exe_file +echo $(LDFLAGS) $(LD_OUT)$@ > __link__.tmp +$(foreach file, $^, $(link_file)) +echo $(LINKPATHS) $(LINKLIBS) >> __link__.tmp +-$(LD) @__link__.tmp +endef + AR = ar ARFLAGS = AR_RULE = $(create_library) +LD_RULE = $(link_exe_file) + include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf index 3f35e30a14..d587141361 100644 --- a/harbour/config/dos/global.cf +++ b/harbour/config/dos/global.cf @@ -30,7 +30,19 @@ else ifeq ($(HB_COMPILER),bcc16) #Use standard dos path, which is already set up. else - COMSPEC := $(subst \,/,$(COMSPEC)) + ifeq ($(HB_COMPILER),rsx32) + #Use standard dos path, which is already set up. + else + ifeq ($(HB_COMPILER),watcom) + #Use standard dos path, which is already set up. + else + ifeq ($(HB_COMPILER),djgpp) + #Use standard dos path, which is already set up. + else + COMSPEC := $(subst \,/,$(COMSPEC)) + endif + endif + endif endif endif diff --git a/harbour/config/dos/rsx32.cf b/harbour/config/dos/rsx32.cf new file mode 100644 index 0000000000..874159eddb --- /dev/null +++ b/harbour/config/dos/rsx32.cf @@ -0,0 +1,69 @@ +# +# $Id$ +# +# GNU Make file for RSXNT for DOS target + +include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf + +OBJ_EXT = .o +EXE_EXT = .exe +LIB_PREF = +LIB_EXT = .a + +CC = gcc +CC_IN = -c +CC_OUT = -o +CPPFLAGS = -I. -I$(HB_INC_COMPILE) -Zrsx32 +CFLAGS = -Wall + +LD = gcc +LDFLAGS = -Zrsx32 +# Note the space after -o +LD_OUT = -o + +# Add all libraries specified in LIBS. +ifeq ($(HB_LIB_COMPILE),) +LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) +else +LINKPATHS += -L$(HB_LIB_COMPILE) +endif + +# The -( option could be appropriate to link against libraries with +# cyclic dependencies, but I think it is not really necessary if the +# libraries are kept in proper order. +# LINKLIBS += -Wl,-( + +LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) + +# If LIBS specifies the rdd library, add all DB drivers. +ifeq ($(findstring rdd,$(LIBS)),rdd) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) +LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) +endif + +# Add the specified GT driver library +ifeq ($(findstring rtl,$(LIBS)),rtl) +LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(ARCH) +LINKLIBS += -l$(HB_GT_LIB) +endif + +# HB_SCREEN_LIB: empty, or one of ncurses, slang +# HB_SCREEN_LIB=ncurses +# HB_SCREEN_LIB=slang + +ifneq ($(HB_SCREEN_LIB),) +LINKLIBS += -l$(HB_SCREEN_LIB) +endif + +# The -) option could be appropriate to link against libraries with +# cyclic dependencies, but I think it is not really necessary if the +# libraries are kept in proper order. +# LINKLIBS += -Wl,-) + +LDFLAGS += $(LINKPATHS) + +AR = ar +ARFLAGS = +AR_RULE = $(AR) $(ARFLAGS) r $@ $^ || $(RM) $@ + +include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 4442a742bc..5fd818d1e0 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -12,10 +12,11 @@ LIB_EXT = .a CC = gcc CC_IN = -c CC_OUT = -o -CPPFLAGS = -I. -I$(HB_INC_COMPILE) -DHARBOUR_GCC_OS2 +CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = -Wall LD = gcc +LDFLAGS = LD_OUT = -o $(SPACE) # Add all libraries specified in LIBS. @@ -40,7 +41,7 @@ LINKLIBS += -l$(HB_GT_LIB) endif #LINKLIBS += -Wl,-) -LDFLAGS = $(LINKPATHS) +LDFLAGS += $(LINKPATHS) # Note: The empty line directly before 'endef' HAVE TO exist! # It causes that every echo command will be separated by LF diff --git a/harbour/config/w32/rsxnt.cf b/harbour/config/w32/rsxnt.cf new file mode 100644 index 0000000000..d7a487913f --- /dev/null +++ b/harbour/config/w32/rsxnt.cf @@ -0,0 +1,72 @@ +# +# $Id$ +# + +include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf + +OBJ_EXT = .o +EXE_EXT = .exe +LIB_PREF = +LIB_EXT = .a + +CC = gcc +CC_IN = -c +CC_OUT = -o +CPPFLAGS = -I. -I$(HB_INC_COMPILE) -Zwin32 +CFLAGS = -Wall + +LD = gcc +LDFLAGS = -Zwin32 +# Note the space after -o +LD_OUT = -o + +# Add all libraries specified in LIBS. +ifeq ($(HB_LIB_COMPILE),) +LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) +else +LINKPATHS += -L$(HB_LIB_COMPILE) +endif + +# The -( option could be appropriate to link against libraries with +# cyclic dependencies, but I think it is not really necessary if the +# libraries are kept in proper order. +# LINKLIBS += -Wl,-( + +LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) + +# This library is needed for CharToOemBuff() and OemToCharBuff() support. +# it's automatically added by RSXNT +#LINKLIBS += -luser32 + +# If LIBS specifies the rdd library, add all DB drivers. +ifeq ($(findstring rdd,$(LIBS)),rdd) +LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(ARCH)) +LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) +endif + +# Add the specified GT driver library +ifeq ($(findstring rtl,$(LIBS)),rtl) +LINKPATHS += -L$(TOP)$(ROOT)source/rtl/$(HB_GT_LIB)/$(ARCH) +LINKLIBS += -l$(HB_GT_LIB) +endif + +# HB_SCREEN_LIB: empty, or one of ncurses, slang +# HB_SCREEN_LIB=ncurses +# HB_SCREEN_LIB=slang + +ifneq ($(HB_SCREEN_LIB),) +LINKLIBS += -l$(HB_SCREEN_LIB) +endif + +# The -) option could be appropriate to link against libraries with +# cyclic dependencies, but I think it is not really necessary if the +# libraries are kept in proper order. +# LINKLIBS += -Wl,-) + +LDFLAGS += $(LINKPATHS) + +AR = ar +ARFLAGS = +AR_RULE = $(AR) $(ARFLAGS) r $@ $^ || $(RM) $@ + +include $(TOP)$(ROOT)config/rules.cf diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index 883916d9ec..f0684ca789 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -274,6 +274,7 @@ extern void hb_ret( void ); /* post a NIL return value */ extern void hb_retc( char * szText ); /* returns a string */ extern void hb_retclen( char * szText, ULONG ulLen ); /* returns a string with a specific length */ extern void hb_retds( char * szDate ); /* returns a date, must use yyyymmdd format */ +extern void hb_retd( long lDay, long lMonth, long lYear ); /* returns a date */ extern void hb_retl( int iTrueFalse ); /* returns a logical integer */ extern void hb_retnd( double dNumber ); /* returns a double */ extern void hb_retni( int iNumber ); /* returns a integer number */ diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index 2c6eb72976..804fc59e47 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -47,14 +47,15 @@ /* Include windows.h if applicable and requested */ #if defined(HB_OS_WIN_32_USED) && defined(HB_OS_WIN_32) + #define WIN32_LEAN_AND_MEAN #include #if defined(__GNUC__) #define HB_DONT_DEFINE_BASIC_TYPES #endif -#endif -#if defined(__IBMCPP__) || defined(HARBOUR_GCC_OS2) +#elif defined(HB_OS_OS2) + /* With the exception of WORD, the IBM Visual Age C++ compiler has its own definitions of the Harbour types most of which conflict with the Harbour #undefs, due to typedef being the prevalent method of @@ -76,7 +77,23 @@ #undef INT #undef UINT #define HB_DONT_DEFINE_BASIC_TYPES -#endif /* __IBMCPP__ */ + +#elif defined(HB_OS_DOS) + + #include + #if defined(__WATCOMC__) + #include + #endif + + #if defined(__WATCOMC__) && defined(__386__) && !defined(__WINDOWS_386__) + #define HB_DOS_INT86 int386 + #elif defined(__RSX32__) + #define HB_DOS_INT86 _int86 + #else + #define HB_DOS_INT86 int86 + #endif + +#endif #if ! defined(HB_DONT_DEFINE_BASIC_TYPES) diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index 4daaefed58..8ad72ef34c 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -95,13 +95,6 @@ */ #define HB_FM_STATISTICS -/* *********************************************************************** - * This symbol defines if we are trying to compile using GCC for OS/2 - * - * By default it is disabled (symbol is not defined) -*/ -/*#define HARBOUR_GCC_OS2*/ - /* *********************************************************************** * This symbol defines which national language module should be included * in the Harbour run time library. See source/rtl/msgxxx for all allowed @@ -163,12 +156,18 @@ */ #endif +/* Detect GCC/OS2 */ + +#if defined(__EMX__) && ! defined(__RSXNT__) + #define HARBOUR_GCC_OS2 +#endif + /* *********************************************************************** * Operating system specific definitions */ #if defined(__GNUC__) /* The GNU C compiler is used */ - #if defined(__DJGPP__) || defined(HARBOUR_GCC_OS2) || defined(_Windows) || defined(_WIN32) + #if defined(__DJGPP__) || defined(__EMX__) || defined(_Windows) || defined(_WIN32) /* The DJGPP port of GNU C is used - for DOS platform */ #define OS_DOS_COMPATIBLE #define OS_PATH_LIST_SEPARATOR ';' @@ -202,7 +201,7 @@ */ #ifndef HB_OS_DOS - #if defined(DOS) || defined(_QC) || defined(__DOS__) || defined(MSDOS) || defined(__MSDOS__) + #if defined(DOS) || defined(_QC) || defined(__DOS__) || defined(MSDOS) || defined(__MSDOS__) || defined(__RSX32__) #define HB_OS_DOS #if defined(__386__) #define HB_OS_DOS_32 @@ -222,7 +221,7 @@ #endif #ifndef HB_OS_WIN_32 - #if defined(WINNT) || defined(_Windows) || defined(__NT__) || defined(_WIN32) || defined(_WINDOWS_) || defined(__WINDOWS_386__) + #if defined(WINNT) || defined(_Windows) || defined(__NT__) || defined(_WIN32) || defined(_WINDOWS_) || defined(__WINDOWS_386__) || defined(__WIN32__) #define HB_OS_WIN_32 #endif #endif diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index c5ffb36bec..bf8544cb07 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -61,20 +61,22 @@ set HB_INC_INSTALL=include\ pause echo HB_COMPILER: echo - When HB_ARCHITECTURE=dos - echo - bcc16 (Borland C++ 3.x, 16-bit DOS) - echo - djgpp (GCC (DJGPP), 32-bit Windows) - echo - watcom + echo - bcc16 (Borland C++ 3.x, DOS 16-bit) + echo - djgpp (Delorie GNU C, DOS 32-bit) + echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) + echo - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit) echo - When HB_ARCHITECTURE=w32 - echo - bcc32 (Borland C++ 4.x,5.x, 32-bit Windows) - echo - gcc (GCC (Cygnus), 32-bit Windows) - echo - mingw32 (GCC (Cygnus/MingW32), Windows 32 bit) - echo - icc - echo - msvc (Microsoft Visual C++, Windows 32 bit) + echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) + echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) + echo - mingw32 (Cygnus/Mingw32 GNU C, Windows 32-bit) + echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) + echo - icc (IBM Visual Age C++, Windows 32-bit) + echo - msvc (Microsoft Visual C++, Windows 32-bit) echo - When HB_ARCHITECTURE=linux - echo - gcc + echo - gcc (GNU C, 32-bit) echo - When HB_ARCHITECTURE=os2 - echo - gcc (GCC (EMX), 32-bit OS/2) - echo - icc (ICC (IBM Visual Age C++ 3.0), 32-bit OS/2) + echo - gcc (EMX GNU C, OS/2 32-bit) + echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) echo. pause echo HB_GT_LIB: diff --git a/harbour/make_gnu.cmd b/harbour/make_gnu.cmd index 4ce0766eb8..a69f0240cf 100644 --- a/harbour/make_gnu.cmd +++ b/harbour/make_gnu.cmd @@ -61,20 +61,22 @@ set HB_INC_INSTALL=include\ pause echo HB_COMPILER: echo - When HB_ARCHITECTURE=dos - echo - bcc16 (Borland C++ 3.x, 16-bit DOS) - echo - djgpp (GCC (DJGPP), 32-bit Windows) - echo - watcom + echo - bcc16 (Borland C++ 3.x, DOS 16-bit) + echo - djgpp (Delorie GNU C, DOS 32-bit) + echo - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit) + echo - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit) echo - When HB_ARCHITECTURE=w32 - echo - bcc32 (Borland C++ 4.x,5.x, 32-bit Windows) - echo - gcc (GCC (Cygnus), 32-bit Windows) - echo - mingw32 (GCC (Cygnus/MingW32), Windows 32 bit) - echo - icc - echo - msvc (Microsoft Visual C++, Windows 32 bit) + echo - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit) + echo - gcc (Cygnus/Cygwin GNU C, Windows 32-bit) + echo - mingw32 (Cygnus/Mingw32 GNU C, Windows 32-bit) + echo - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit) + echo - icc (IBM Visual Age C++, Windows 32-bit) + echo - msvc (Microsoft Visual C++, Windows 32-bit) echo - When HB_ARCHITECTURE=linux - echo - gcc + echo - gcc (GNU C, 32-bit) echo - When HB_ARCHITECTURE=os2 - echo - gcc (GCC (EMX), 32-bit OS/2) - echo - icc (ICC (IBM Visual Age C++ 3.0), 32-bit OS/2) + echo - gcc (EMX GNU C, OS/2 32-bit) + echo - icc (IBM Visual Age C++ 3.0, OS/2 32-bit) echo. pause echo HB_GT_LIB: diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh index 7acd50aa7c..1957d6607a 100644 --- a/harbour/make_gnu.sh +++ b/harbour/make_gnu.sh @@ -61,20 +61,22 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then read echo " HB_COMPILER:" echo " - When HB_ARCHITECTURE=dos" - echo " - bcc16 (Borland C++ 3.x, 16-bit DOS)" - echo " - djgpp (GCC (DJGPP), 32-bit Windows)" - echo " - watcom" + echo " - bcc16 (Borland C++ 3.x, DOS 16-bit)" + echo " - djgpp (Delorie GNU C, DOS 32-bit)" + echo " - rxs32 (EMX/RSXNT/DOS GNU C, DOS 32-bit)" + echo " - watcom (Watcom C++ 9.x, 10.x, 11.x, DOS 32-bit)" echo " - When HB_ARCHITECTURE=w32" - echo " - bcc32 (Borland C++ 4.x,5.x, 32-bit Windows)" - echo " - gcc (GCC (Cygnus), 32-bit Windows)" - echo " - mingw32 (GCC (Cygnus/MingW32), Windows 32 bit)" - echo " - icc" - echo " - msvc (Microsoft Visual C++, Windows 32 bit)" + echo " - bcc32 (Borland C++ 4.x, 5.x, Windows 32-bit)" + echo " - gcc (Cygnus/Cygwin GNU C, Windows 32-bit)" + echo " - mingw32 (Cygnus/Mingw32 GNU C, Windows 32-bit)" + echo " - rxsnt (EMX/RSXNT/Win32 GNU C, Windows 32-bit)" + echo " - icc (IBM Visual Age C++, Windows 32-bit)" + echo " - msvc (Microsoft Visual C++, Windows 32-bit)" echo " - When HB_ARCHITECTURE=linux" - echo " - gcc" + echo " - gcc (GNU C, 32-bit)" echo " - When HB_ARCHITECTURE=os2" - echo " - gcc (GCC (EMX), 32-bit OS/2)" - echo " - icc (ICC (IBM Visual Age C++ 3.0), 32-bit OS/2)" + echo " - gcc (EMX GNU C, OS/2 32-bit)" + echo " - icc (IBM Visual Age C++ 3.0, OS/2 32-bit)" echo read echo " HB_GT_LIB:" diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 666dd78e3d..1b6fc4545d 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -48,6 +48,10 @@ BIN_DIR = bin\b32 OBJ_DIR = obj\b32 LIB_DIR = lib\b32 +# This is needed, otherwise the libs may overflow when +# debug info is requested with -v -y +ARFLAGS = /P32 + !endif !if !$d(BCC_NOOPTIM) @@ -590,31 +594,31 @@ $(GTWIN_LIB) : $(GTWIN_LIB_OBJS) $(OBJ_DIR)\hbfsapi.obj : $(COMMON_DIR)\hbfsapi.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(COMMON_LIB) -+$@,, + tlib $(COMMON_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\hbstr.obj : $(COMMON_DIR)\hbstr.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(COMMON_LIB) -+$@,, + tlib $(COMMON_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\hbtrace.obj : $(COMMON_DIR)\hbtrace.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(COMMON_LIB) -+$@,, + tlib $(COMMON_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\hbver.obj : $(COMMON_DIR)\hbver.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(COMMON_LIB) -+$@,, + tlib $(COMMON_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\expropt1.obj : $(COMMON_DIR)\expropt1.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(COMMON_LIB) -+$@,, + tlib $(COMMON_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\expropt2.obj : $(COMMON_DIR)\expropt2.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(COMMON_LIB) -+$@,, + tlib $(COMMON_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\reserved.obj : $(COMMON_DIR)\reserved.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(COMMON_LIB) -+$@,, + tlib $(COMMON_LIB) $(ARFLAGS) -+$@,, # # PP.LIB dependencies @@ -622,19 +626,19 @@ $(OBJ_DIR)\reserved.obj : $(COMMON_DIR)\reserved.c $(OBJ_DIR)\ppcore.obj : $(PP_DIR)\ppcore.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(PP_LIB) -+$@,, + tlib $(PP_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\ppcomp.obj : $(PP_DIR)\ppcomp.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(PP_LIB) -+$@,, + tlib $(PP_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\pplib.obj : $(PP_DIR)\pplib.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(PP_LIB) -+$@,, + tlib $(PP_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(PP_LIB) -+$@,, + tlib $(PP_LIB) $(ARFLAGS) -+$@,, # # HARBOUR.EXE dependencies @@ -730,65 +734,65 @@ $(OBJ_DIR)\hbfunchk.obj : $(COMPILER_DIR)\hbfunchk.c $(OBJ_DIR)\dbcmd.obj : $(RDD_DIR)\dbcmd.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbf0.c : $(RDD_DIR)\dbf0.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\dbf0.obj : $(OBJ_DIR)\dbf0.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbf1.obj : $(RDD_DIR)\dbf1.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbnubs.obj : $(RDD_DIR)\dbnubs.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbstrux.c : $(RDD_DIR)\dbstrux.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\dbstrux.obj : $(OBJ_DIR)\dbstrux.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\sdf0.c : $(RDD_DIR)\sdf0.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\sdf0.obj : $(OBJ_DIR)\sdf0.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\sdf1.obj : $(RDD_DIR)\sdf1.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\delim0.c : $(RDD_DIR)\delim0.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\delim0.obj : $(OBJ_DIR)\delim0.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\delim1.obj : $(RDD_DIR)\delim1.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\rddord.c : $(RDD_DIR)\rddord.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\rddord.obj : $(OBJ_DIR)\rddord.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\rddsys.c : $(RDD_DIR)\rddsys.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\rddsys.obj : $(OBJ_DIR)\rddsys.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RDD_LIB) -+$@,, + tlib $(RDD_LIB) $(ARFLAGS) -+$@,, # # VM.LIB dependencies @@ -796,110 +800,110 @@ $(OBJ_DIR)\rddsys.obj : $(OBJ_DIR)\rddsys.c $(OBJ_DIR)\arrays.obj : $(VM_DIR)\arrays.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\arrayshb.obj : $(VM_DIR)\arrayshb.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\break.obj : $(VM_DIR)\break.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\classes.obj : $(VM_DIR)\classes.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\cmdarg.obj : $(VM_DIR)\cmdarg.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\codebloc.obj : $(VM_DIR)\codebloc.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\debug.obj : $(VM_DIR)\debug.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dynsym.obj : $(VM_DIR)\dynsym.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\extend.obj : $(VM_DIR)\extend.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\fm.obj : $(VM_DIR)\fm.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\harbinit.c : $(VM_DIR)\harbinit.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\harbinit.obj : $(OBJ_DIR)\harbinit.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\hvm.obj : $(VM_DIR)\hvm.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\initexit.obj : $(VM_DIR)\initexit.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\initsymb.obj : $(VM_DIR)\initsymb.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\itemapi.obj : $(VM_DIR)\itemapi.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\macro.obj : $(VM_DIR)\macro.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\maindll.obj : $(VM_DIR)\maindll.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mainwin.obj : $(VM_DIR)\mainwin.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\memvars.obj : $(VM_DIR)\memvars.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\memvclip.obj : $(VM_DIR)\memvclip.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\pcount.obj : $(VM_DIR)\pcount.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\proc.obj : $(VM_DIR)\proc.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\pvalue.obj : $(VM_DIR)\pvalue.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\runner.obj : $(VM_DIR)\runner.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\symbols.obj : $(VM_DIR)\symbols.asm $(AS) $**, $@ - tlib $(VM_LIB) -+$@,, + tlib $(VM_LIB) $(ARFLAGS) -+$@,, # # RTL.LIB dependencies @@ -907,663 +911,663 @@ $(OBJ_DIR)\symbols.obj : $(VM_DIR)\symbols.asm $(OBJ_DIR)\abs.obj : $(RTL_DIR)\abs.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\accept.obj : $(RTL_DIR)\accept.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\achoice.c : $(RTL_DIR)\achoice.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\achoice.obj : $(OBJ_DIR)\achoice.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\adir.c : $(RTL_DIR)\adir.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\adir.obj : $(OBJ_DIR)\adir.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\alert.c : $(RTL_DIR)\alert.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\alert.obj : $(OBJ_DIR)\alert.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\ampm.obj : $(RTL_DIR)\ampm.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\asort.c : $(RTL_DIR)\asort.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\asort.obj : $(OBJ_DIR)\asort.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\at.obj : $(RTL_DIR)\at.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\binnum.obj : $(RTL_DIR)\binnum.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\binnumx.obj : $(RTL_DIR)\binnumx.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\box.obj : $(RTL_DIR)\box.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\browdb.c : $(RTL_DIR)\browdb.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\browdb.obj : $(OBJ_DIR)\browdb.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\browdbx.c : $(RTL_DIR)\browdbx.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\browdbx.obj : $(OBJ_DIR)\browdbx.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\browse.c : $(RTL_DIR)\browse.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\browse.obj : $(OBJ_DIR)\browse.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\chrasc.obj : $(RTL_DIR)\chrasc.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\colorind.obj : $(RTL_DIR)\colorind.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\console.obj : $(RTL_DIR)\console.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\copyfile.obj : $(RTL_DIR)\copyfile.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\datec.obj : $(RTL_DIR)\datec.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\datehb.obj : $(RTL_DIR)\datehb.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dates.obj : $(RTL_DIR)\dates.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dateshb.obj : $(RTL_DIR)\dateshb.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\datesx.obj : $(RTL_DIR)\datesx.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbedit.c : $(RTL_DIR)\dbedit.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\dbedit.obj : $(OBJ_DIR)\dbedit.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\defpath.obj : $(RTL_DIR)\defpath.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\descend.obj : $(RTL_DIR)\descend.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\devoutp.c : $(RTL_DIR)\devoutp.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\devoutp.obj : $(OBJ_DIR)\devoutp.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dir.obj : $(RTL_DIR)\dir.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dirdrive.obj : $(RTL_DIR)\dirdrive.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\diskspac.obj : $(RTL_DIR)\diskspac.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dircmd.c : $(RTL_DIR)\dircmd.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\dircmd.obj : $(OBJ_DIR)\dircmd.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\do.obj : $(RTL_DIR)\do.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dummy.c : $(RTL_DIR)\dummy.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\dummy.obj : $(OBJ_DIR)\dummy.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\empty.obj : $(RTL_DIR)\empty.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\errorapi.obj : $(RTL_DIR)\errorapi.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\errorsys.c : $(RTL_DIR)\errorsys.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\errorsys.obj : $(OBJ_DIR)\errorsys.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\eval.obj : $(RTL_DIR)\eval.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\fieldbl.c : $(RTL_DIR)\fieldbl.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\fieldbl.obj : $(OBJ_DIR)\fieldbl.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\getlist.c : $(RTL_DIR)\getlist.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\getlist.obj : $(OBJ_DIR)\getlist.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\getsys.c : $(RTL_DIR)\getsys.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\getsys.obj : $(OBJ_DIR)\getsys.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\filesys.obj : $(RTL_DIR)\filesys.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\fkmax.obj : $(RTL_DIR)\fkmax.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\fnsplit.obj : $(RTL_DIR)\fnsplit.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\fssize.obj : $(RTL_DIR)\fssize.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\fstemp.obj : $(RTL_DIR)\fstemp.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\gete.obj : $(RTL_DIR)\gete.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\gt.obj : $(RTL_DIR)\gt.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\gtapi.obj : $(RTL_DIR)\gtapi.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\gx.obj : $(RTL_DIR)\gx.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\hardcr.obj : $(RTL_DIR)\hardcr.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\inkey.obj : $(RTL_DIR)\inkey.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\input.c : $(RTL_DIR)\input.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\input.obj : $(OBJ_DIR)\input.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\is.obj : $(RTL_DIR)\is.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\isprint.obj : $(RTL_DIR)\isprint.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\langapi.obj : $(RTL_DIR)\langapi.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\left.obj : $(RTL_DIR)\left.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\len.obj : $(RTL_DIR)\len.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\lennum.obj : $(RTL_DIR)\lennum.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\math.obj : $(RTL_DIR)\math.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\maxrow.obj : $(RTL_DIR)\maxrow.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\minmax.obj : $(RTL_DIR)\minmax.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\memofile.obj : $(RTL_DIR)\memofile.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\memoline.obj : $(RTL_DIR)\memoline.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\memvarbl.c : $(RTL_DIR)\memvarbl.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\memvarbl.obj : $(OBJ_DIR)\memvarbl.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\menuto.c : $(RTL_DIR)\menuto.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\menuto.obj : $(OBJ_DIR)\menuto.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mlcount.obj : $(RTL_DIR)\mlcount.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mlpos.obj : $(RTL_DIR)\mlpos.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mod.obj : $(RTL_DIR)\mod.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mouseapi.obj : $(RTL_DIR)\mouseapi.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mousex.obj : $(RTL_DIR)\mousex.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\msgxxx.obj : $(RTL_DIR)\msgxxx.c $(CC) $(CLIBFLAGS) -I$(RTL_DIR) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mtran.obj : $(RTL_DIR)\mtran.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\natmsg.obj : $(RTL_DIR)\natmsg.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\net.obj : $(RTL_DIR)\net.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\objfunc.c : $(RTL_DIR)\objfunc.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\objfunc.obj : $(OBJ_DIR)\objfunc.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\oemansi.obj : $(RTL_DIR)\oemansi.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\oldbox.obj : $(RTL_DIR)\oldbox.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\oldclear.obj : $(RTL_DIR)\oldclear.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\pad.obj : $(RTL_DIR)\pad.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\padc.obj : $(RTL_DIR)\padc.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\padl.obj : $(RTL_DIR)\padl.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\padr.obj : $(RTL_DIR)\padr.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\philes.obj : $(RTL_DIR)\philes.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\philes53.obj : $(RTL_DIR)\philes53.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\philesx.obj : $(RTL_DIR)\philesx.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\rat.obj : $(RTL_DIR)\rat.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\readkey.c : $(RTL_DIR)\readkey.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\readkey.obj : $(OBJ_DIR)\readkey.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\readvar.c : $(RTL_DIR)\readvar.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\readvar.obj : $(OBJ_DIR)\readvar.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\replic.obj : $(RTL_DIR)\replic.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\right.obj : $(RTL_DIR)\right.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\round.obj : $(RTL_DIR)\round.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\run.obj : $(RTL_DIR)\run.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\samples.obj : $(RTL_DIR)\samples.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\saverest.obj : $(RTL_DIR)\saverest.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\scroll.obj : $(RTL_DIR)\scroll.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\seconds.obj : $(RTL_DIR)\seconds.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\set.obj : $(RTL_DIR)\set.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\setcolor.obj : $(RTL_DIR)\setcolor.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\setcurs.obj : $(RTL_DIR)\setcurs.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\setfunc.c : $(RTL_DIR)\setfunc.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\setfunc.obj : $(OBJ_DIR)\setfunc.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\setkey.c : $(RTL_DIR)\setkey.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\setkey.obj : $(OBJ_DIR)\setkey.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\setpos.obj : $(RTL_DIR)\setpos.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\setposbs.obj : $(RTL_DIR)\setposbs.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\setta.c : $(RTL_DIR)\setta.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\setta.obj : $(OBJ_DIR)\setta.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\shadow.obj : $(RTL_DIR)\shadow.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\soundex.obj : $(RTL_DIR)\soundex.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\space.obj : $(RTL_DIR)\space.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\str.obj : $(RTL_DIR)\str.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strcase.obj : $(RTL_DIR)\strcase.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strings.obj : $(RTL_DIR)\strings.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strmatch.obj : $(RTL_DIR)\strmatch.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strtran.obj : $(RTL_DIR)\strtran.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strzero.obj : $(RTL_DIR)\strzero.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\stuff.obj : $(RTL_DIR)\stuff.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\substr.obj : $(RTL_DIR)\substr.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\tbcolumn.c : $(RTL_DIR)\tbcolumn.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\tbcolumn.obj : $(OBJ_DIR)\tbcolumn.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\tbrowse.c : $(RTL_DIR)\tbrowse.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\tbrowse.obj : $(OBJ_DIR)\tbrowse.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\tclass.c : $(RTL_DIR)\tclass.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\tclass.obj : $(OBJ_DIR)\tclass.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\terror.c : $(RTL_DIR)\terror.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\terror.obj : $(OBJ_DIR)\terror.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\text.c : $(RTL_DIR)\text.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\text.obj : $(OBJ_DIR)\text.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\tget.c : $(RTL_DIR)\tget.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\tget.obj : $(OBJ_DIR)\tget.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\tgetlist.c : $(RTL_DIR)\tgetlist.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\tgetlist.obj : $(OBJ_DIR)\tgetlist.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\tlabel.c : $(RTL_DIR)\tlabel.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\tlabel.obj : $(OBJ_DIR)\tlabel.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\tone.obj : $(RTL_DIR)\tone.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\trace.obj : $(RTL_DIR)\trace.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\transfrm.obj : $(RTL_DIR)\transfrm.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\treport.c : $(RTL_DIR)\treport.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\treport.obj : $(OBJ_DIR)\treport.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\trim.obj : $(RTL_DIR)\trim.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\type.obj : $(RTL_DIR)\type.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\typefile.c : $(RTL_DIR)\typefile.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\typefile.obj : $(OBJ_DIR)\typefile.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\val.obj : $(RTL_DIR)\val.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\valtostr.obj : $(RTL_DIR)\valtostr.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\valtype.obj : $(RTL_DIR)\valtype.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\version.obj : $(RTL_DIR)\version.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\wait.c : $(RTL_DIR)\wait.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\wait.obj : $(OBJ_DIR)\wait.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\word.obj : $(RTL_DIR)\word.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\xhelp.obj : $(RTL_DIR)\xhelp.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\xsavescr.c : $(RTL_DIR)\xsavescr.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\xsavescr.obj : $(OBJ_DIR)\xsavescr.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) -+$@,, + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, # # TOOLS.LIB dependencies @@ -1571,164 +1575,164 @@ $(OBJ_DIR)\xsavescr.obj : $(OBJ_DIR)\xsavescr.c $(OBJ_DIR)\asciisum.obj : $(TOOLS_DIR)\asciisum.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\ascpos.obj : $(TOOLS_DIR)\ascpos.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\atdiff.obj : $(TOOLS_DIR)\atdiff.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\chareven.obj : $(TOOLS_DIR)\chareven.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\charmix.obj : $(TOOLS_DIR)\charmix.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\charodd.obj : $(TOOLS_DIR)\charodd.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\chrcount.obj : $(TOOLS_DIR)\chrcount.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\chrfirst.obj : $(TOOLS_DIR)\chrfirst.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\chrtotal.obj : $(TOOLS_DIR)\chrtotal.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\ctchksum.obj : $(TOOLS_DIR)\ctchksum.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\ctchrmix.obj : $(TOOLS_DIR)\ctchrmix.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\ctcolton.obj : $(TOOLS_DIR)\ctcolton.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\ctcrypt.obj : $(TOOLS_DIR)\ctcrypt.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\ctposupp.obj : $(TOOLS_DIR)\ctposupp.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dates2.obj : $(TOOLS_DIR)\dates2.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbftools.obj : $(TOOLS_DIR)\dbftools.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\ctmisc.c : $(TOOLS_DIR)\ctmisc.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\ctmisc.obj : $(OBJ_DIR)\ctmisc.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\cttoken.c : $(TOOLS_DIR)\cttoken.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\cttoken.obj : $(OBJ_DIR)\cttoken.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\fileread.c : $(TOOLS_DIR)\fileread.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\fileread.obj : $(OBJ_DIR)\fileread.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\hb_f.obj : $(TOOLS_DIR)\hb_f.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mathx.obj : $(TOOLS_DIR)\mathx.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\nconvert.c : $(TOOLS_DIR)\nconvert.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\nconvert.obj : $(OBJ_DIR)\nconvert.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\numtxten.c : $(TOOLS_DIR)\numtxten.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\numtxten.obj : $(OBJ_DIR)\numtxten.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\numtxthu.c : $(TOOLS_DIR)\numtxthu.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\numtxthu.obj : $(OBJ_DIR)\numtxthu.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strasint.obj : $(TOOLS_DIR)\strasint.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strcount.obj : $(TOOLS_DIR)\strcount.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strcspn.obj : $(TOOLS_DIR)\strcspn.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strdiff.obj : $(TOOLS_DIR)\strdiff.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strexpan.obj : $(TOOLS_DIR)\strexpan.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strfmt.obj : $(TOOLS_DIR)\strfmt.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\stringp.c : $(TOOLS_DIR)\stringp.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\stringp.obj : $(OBJ_DIR)\stringp.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\stringsx.obj : $(TOOLS_DIR)\stringsx.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strleft.obj : $(TOOLS_DIR)\strleft.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strpbrk.obj : $(TOOLS_DIR)\strpbrk.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\strright.obj : $(TOOLS_DIR)\strright.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) -+$@,, + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, # # MACRO.LIB dependencies @@ -1742,25 +1746,25 @@ $(OBJ_DIR)\macrol.c : $(MACRO_DIR)\macro.l $(OBJ_DIR)\macroy.obj : $(OBJ_DIR)\macroy.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(MACRO_LIB) -+$@,, + tlib $(MACRO_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\macrol.obj : $(OBJ_DIR)\macrol.c -echo. > $(OBJ_DIR)\unistd.h $(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -o$@ $** -del $(OBJ_DIR)\unistd.h - tlib $(MACRO_LIB) -+$@,, + tlib $(MACRO_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\macroa.obj : $(MACRO_DIR)\macroa.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(MACRO_LIB) -+$@,, + tlib $(MACRO_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\macrob.obj : $(MACRO_DIR)\macrob.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(MACRO_LIB) -+$@,, + tlib $(MACRO_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\macroc.obj : $(MACRO_DIR)\macroc.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(MACRO_LIB) -+$@,, + tlib $(MACRO_LIB) $(ARFLAGS) -+$@,, # # NULSYS.LIB dependencies @@ -1771,7 +1775,7 @@ $(OBJ_DIR)\nulsys.c : $(RDD_DIR)\nulsys\nulsys.prg $(OBJ_DIR)\nulsys.obj : $(OBJ_DIR)\nulsys.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(NULSYS_LIB) -+$@,, + tlib $(NULSYS_LIB) $(ARFLAGS) -+$@,, # # DBFNTX.LIB dependencies @@ -1782,11 +1786,11 @@ $(OBJ_DIR)\dbfntx0.c : $(RDD_DIR)\dbfntx\dbfntx0.prg $(OBJ_DIR)\dbfntx0.obj : $(OBJ_DIR)\dbfntx0.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DBFNTX_LIB) -+$@,, + tlib $(DBFNTX_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbfntx1.obj : $(RDD_DIR)\dbfntx\dbfntx1.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DBFNTX_LIB) -+$@,, + tlib $(DBFNTX_LIB) $(ARFLAGS) -+$@,, # # DBFCDX.LIB dependencies @@ -1797,11 +1801,11 @@ $(OBJ_DIR)\dbfcdx0.c : $(RDD_DIR)\dbfcdx\dbfcdx0.prg $(OBJ_DIR)\dbfcdx0.obj : $(OBJ_DIR)\dbfcdx0.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DBFCDX_LIB) -+$@,, + tlib $(DBFCDX_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbfcdx1.obj : $(RDD_DIR)\dbfcdx\dbfcdx1.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DBFCDX_LIB) -+$@,, + tlib $(DBFCDX_LIB) $(ARFLAGS) -+$@,, # # DEBUG.LIB dependencies @@ -1812,35 +1816,35 @@ $(OBJ_DIR)\dbgmenu.c : $(DEBUG_DIR)\dbgmenu.prg $(OBJ_DIR)\dbgmenu.obj : $(OBJ_DIR)\dbgmenu.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DEBUG_LIB) -+$@,, + tlib $(DEBUG_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbgtmenu.c : $(DEBUG_DIR)\dbgtmenu.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\dbgtmenu.obj : $(OBJ_DIR)\dbgtmenu.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DEBUG_LIB) -+$@,, + tlib $(DEBUG_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\dbgtwin.c : $(DEBUG_DIR)\dbgtwin.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\dbgtwin.obj : $(OBJ_DIR)\dbgtwin.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DEBUG_LIB) -+$@,, + tlib $(DEBUG_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\debugger.c : $(DEBUG_DIR)\debugger.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\debugger.obj : $(OBJ_DIR)\debugger.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DEBUG_LIB) -+$@,, + tlib $(DEBUG_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\tbrwtext.c : $(DEBUG_DIR)\tbrwtext.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ $(OBJ_DIR)\tbrwtext.obj : $(OBJ_DIR)\tbrwtext.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(DEBUG_LIB) -+$@,, + tlib $(DEBUG_LIB) $(ARFLAGS) -+$@,, # # GTDOS.LIB dependencies @@ -1848,11 +1852,11 @@ $(OBJ_DIR)\tbrwtext.obj : $(OBJ_DIR)\tbrwtext.c $(OBJ_DIR)\gtdos.obj : $(RTL_DIR)\gtdos\gtdos.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(GTDOS_LIB) -+$@,, + tlib $(GTDOS_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mousedos.obj : $(RTL_DIR)\gtdos\mousedos.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(GTDOS_LIB) -+$@,, + tlib $(GTDOS_LIB) $(ARFLAGS) -+$@,, # # GTPCA.LIB dependencies @@ -1860,11 +1864,11 @@ $(OBJ_DIR)\mousedos.obj : $(RTL_DIR)\gtdos\mousedos.c $(OBJ_DIR)\gtpca.obj : $(RTL_DIR)\gtpca\gtpca.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(GTPCA_LIB) -+$@,, + tlib $(GTPCA_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mousepca.obj : $(RTL_DIR)\gtpca\mousepca.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(GTPCA_LIB) -+$@,, + tlib $(GTPCA_LIB) $(ARFLAGS) -+$@,, # # GTSTD.LIB dependencies @@ -1872,11 +1876,11 @@ $(OBJ_DIR)\mousepca.obj : $(RTL_DIR)\gtpca\mousepca.c $(OBJ_DIR)\gtstd.obj : $(RTL_DIR)\gtstd\gtstd.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(GTSTD_LIB) -+$@,, + tlib $(GTSTD_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mousestd.obj : $(RTL_DIR)\gtstd\mousestd.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(GTSTD_LIB) -+$@,, + tlib $(GTSTD_LIB) $(ARFLAGS) -+$@,, # # GTWIN.LIB dependencies @@ -1884,11 +1888,11 @@ $(OBJ_DIR)\mousestd.obj : $(RTL_DIR)\gtstd\mousestd.c $(OBJ_DIR)\gtwin.obj : $(RTL_DIR)\gtwin\gtwin.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(GTWIN_LIB) -+$@,, + tlib $(GTWIN_LIB) $(ARFLAGS) -+$@,, $(OBJ_DIR)\mousewin.obj : $(RTL_DIR)\gtwin\mousewin.c $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(GTWIN_LIB) -+$@,, + tlib $(GTWIN_LIB) $(ARFLAGS) -+$@,, # # HBPP.EXE dependencies diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c index 2818cdb08c..6a69a28a91 100644 --- a/harbour/source/common/hbver.c +++ b/harbour/source/common/hbver.c @@ -66,30 +66,19 @@ #include "hbver.h" #if defined(HB_OS_WIN_32) + #include - #if ! defined(VER_PLATFORM_WIN32_WINDOWS) + #ifndef VER_PLATFORM_WIN32_WINDOWS #define VER_PLATFORM_WIN32_WINDOWS 1 #endif - #if ! defined(VER_PLATFORM_WIN32_CE) + #ifndef VER_PLATFORM_WIN32_CE #define VER_PLATFORM_WIN32_CE 3 #endif -#endif -#if defined(HB_OS_DOS) - #include - #if defined(__WATCOMC__) - #include - #endif +#elif defined(HB_OS_UNIX) - #if defined(__WATCOMC__) && defined(__386__) && !defined(__WINDOWS_386__) - #define INT_86 int386 - #else - #define INT_86 int86 - #endif -#endif - -#if defined(HB_OS_UNIX) #include + #endif /* NOTE: OS() function, as a primary goal will detect the version number @@ -115,19 +104,15 @@ char * hb_verPlatform( void ) union REGS regs; regs.h.ah = 0x30; - INT_86( 0x21, ®s, ®s ); + HB_DOS_INT86( 0x21, ®s, ®s ); sprintf( pszPlatform, "DOS %d.%02d", regs.h.al, regs.h.ah ); /* Host OS detection: Windows 2.x, 3.x, 95/98 */ { - #if defined(__BORLANDC__) || defined(_MSC_VER) - regs.x.ax = 0x1600; - #else - regs.w.ax = 0x1600; - #endif - INT_86( 0x2F, ®s, ®s ); + regs.x.ax = 0x1600; + HB_DOS_INT86( 0x2F, ®s, ®s ); if( regs.h.al != 0x00 && regs.h.al != 0x80 ) { @@ -145,26 +130,18 @@ char * hb_verPlatform( void ) /* Host OS detection: Windows NT/2000 */ { - #if defined(__BORLANDC__) || defined(_MSC_VER) - regs.x.ax = 0x3306; - #else - regs.w.ax = 0x3306; - #endif - INT_86( 0x21, ®s, ®s ); + regs.x.ax = 0x3306; + HB_DOS_INT86( 0x21, ®s, ®s ); - #if defined(__BORLANDC__) || defined(_MSC_VER) - if( regs.x.bx == 0x3205 ) - #else - if( regs.w.bx == 0x3205 ) - #endif - strcat( pszPlatform, " (Windows NT/2000)" ); + if( regs.x.bx == 0x3205 ) + strcat( pszPlatform, " (Windows NT/2000)" ); } /* Host OS detection: OS/2 */ { regs.h.ah = 0x30; - INT_86( 0x21, ®s, ®s ); + HB_DOS_INT86( 0x21, ®s, ®s ); if( regs.h.al >= 10 ) { @@ -235,11 +212,11 @@ char * hb_verPlatform( void ) break; } - sprintf( pszPlatform, "%s %d.%02d.%04d", + sprintf( pszPlatform, "%s %lu.%02lu.%04d", pszName, - osVer.dwMajorVersion, - osVer.dwMinorVersion, - LOWORD( osVer.dwBuildNumber ) ); + ( ULONG ) osVer.dwMajorVersion, + ( ULONG ) osVer.dwMinorVersion, + ( USHORT ) LOWORD( osVer.dwBuildNumber ) ); /* Add service pack/other info */ @@ -248,7 +225,7 @@ char * hb_verPlatform( void ) int i; /* Skip the leading spaces (Win95B, Win98) */ - for( i = 0; osVer.szCSDVersion[ i ] != '\0' && isspace( osVer.szCSDVersion[ i ] ); i++ ); + for( i = 0; osVer.szCSDVersion[ i ] != '\0' && isspace( ( int ) osVer.szCSDVersion[ i ] ); i++ ); if( osVer.szCSDVersion[ i ] != '\0' ) { @@ -363,15 +340,19 @@ char * hb_verCompiler( void ) #elif defined(__GNUC__) #if defined(__DJGPP__) - pszName = "Delorie GCC"; + pszName = "Delorie GNU C"; #elif defined(__CYGWIN__) - pszName = "Cygnus Cygwin GCC"; + pszName = "Cygnus Cygwin GNU C"; #elif defined(__MINGW32__) - pszName = "Cygnus Mingw32 GCC"; + pszName = "Cygnus Mingw32 GNU C"; + #elif defined(__RSX32__) + pszName = "EMX/RSXNT/DOS GNU C"; + #elif defined(__RSXNT__) + pszName = "EMX/RSXNT/Win32 GNU C"; #elif defined(__EMX__) - pszName = "EMX GCC"; + pszName = "EMX GNU C"; #else - pszName = "GCC"; + pszName = "GNU C"; #endif iVerMajor = __GNUC__; @@ -386,10 +367,20 @@ char * hb_verCompiler( void ) #endif if( pszName ) - sprintf( pszCompiler, "%s %d.%d", pszName, iVerMajor, iVerMinor ); + sprintf( pszCompiler, "%s %hd.%hd", pszName, iVerMajor, iVerMinor ); else strcpy( pszCompiler, "(unknown)" ); +#if defined(__DJGPP__) + + { + char szSub[ 32 ]; + sprintf( szSub, " (DJGPP %i.%02i)", ( int ) __DJGPP__, ( int ) __DJGPP_MINOR__ ); + strcat( pszCompiler, szSub ); + } + +#endif + return pszCompiler; } diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index 73e589789a..20859d793f 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -121,7 +121,7 @@ static void DebugPragma( char *, int, BOOL ); static BOOL s_bTracePragma = FALSE; -#define ISNAME( c ) ( isalnum( c ) || ( c ) == '_' || ( c ) > 0x7E ) +#define ISNAME( c ) ( isalnum( ( int ) c ) || ( c ) == '_' || ( c ) > 0x7E ) #define MAX_NAME 255 #define MAX_EXP 1024 #define PATTERN_SIZE 2048 diff --git a/harbour/source/rtl/dateshb.c b/harbour/source/rtl/dateshb.c index 40554fb072..f295d113ab 100644 --- a/harbour/source/rtl/dateshb.c +++ b/harbour/source/rtl/dateshb.c @@ -69,9 +69,6 @@ #else #include #endif -#if defined(__TURBOC__) || defined(__BORLANDC__) || defined(__DJGPP__) - #include -#endif HB_FUNC( CTOD ) { diff --git a/harbour/source/rtl/diskspac.c b/harbour/source/rtl/diskspac.c index 9267949142..32d0d92d08 100644 --- a/harbour/source/rtl/diskspac.c +++ b/harbour/source/rtl/diskspac.c @@ -33,17 +33,6 @@ * */ -/* - * The following parts are Copyright of the individual authors. - * www - http://www.harbour-project.org - * - * Copyright 1999 Luiz Rafael Culik - * Parts of DOS support - * - * See doc/license.txt for licensing terms. - * - */ - /* NOTE: DISKSPACE() supports larger disks than 2GB. CA-Cl*pper will always return a (long) value, Harbour may return a (double) for large values, the decimal places are always set to zero, though. */ @@ -54,10 +43,6 @@ #include "hbapierr.h" #include "hbapifs.h" -#if defined(HB_OS_DOS) || defined(__WATCOMC__) - #include -#endif - #if defined(HB_OS_OS2) #define INCL_BASE #define INCL_DOSERRORS @@ -76,49 +61,59 @@ HB_FUNC( DISKSPACE ) if( uiType > HB_DISK_TOTAL ) uiType = HB_DISK_TOTAL; -#if defined(HB_OS_DOS) || defined(__WATCOMC__) +#if defined(HB_OS_DOS) { - struct diskfree_t disk; - unsigned uiResult; - - while( ( uiResult = _dos_getdiskfree( uiDrive, &disk ) ) != 0 ) + while( TRUE ) { - USHORT uiAction = hb_errRT_BASE_Ext1( EG_OPEN, 2018, NULL, NULL, 0, EF_CANDEFAULT ); - - /* NOTE: Under 'Standard' behaviour, this error does not allow 'retry' - but if you should wish to make it so, then or EF_CANRETRY with - EF_CANDEFAULT above) - */ - - if( uiAction != E_RETRY ) - break; - } - - if( uiResult != 0 ) - { - switch( uiType ) + union REGS regs; + + regs.x.dx = uiDrive; + regs.h.ah = 0x36; + HB_DOS_INT86( 0x21, ®s, ®s ); + + if( regs.x.ax != 0xFFFF ) { - case HB_DISK_AVAIL: - case HB_DISK_FREE: - dSpace = ( double ) disk.avail_clusters * - ( double ) disk.sectors_per_cluster * - ( double ) disk.bytes_per_sector; - break; - - case HB_DISK_USED: - case HB_DISK_TOTAL: - dSpace = ( double ) disk.total_clusters * - ( double ) disk.sectors_per_cluster * - ( double ) disk.bytes_per_sector; - - if( uiType == HB_DISK_USED ) - dSpace -= ( double ) disk.avail_clusters * - ( double ) disk.sectors_per_cluster * - ( double ) disk.bytes_per_sector; - break; + USHORT uiClusterTotal = regs.x.dx; + USHORT uiClusterFree = regs.x.bx; + USHORT uiSecPerCluster = regs.x.ax; + USHORT uiSectorSize = regs.x.cx; + + switch( uiType ) + { + case HB_DISK_AVAIL: + case HB_DISK_FREE: + dSpace = ( double ) uiClusterFree * + ( double ) uiSecPerCluster * + ( double ) uiSectorSize; + break; + + case HB_DISK_USED: + case HB_DISK_TOTAL: + dSpace = ( double ) uiClusterTotal * + ( double ) uiSecPerCluster * + ( double ) uiSectorSize; + + if( uiType == HB_DISK_USED ) + dSpace -= ( double ) uiClusterFree * + ( double ) uiSecPerCluster * + ( double ) uiSectorSize; + break; + } } - + else + { + USHORT uiAction = hb_errRT_BASE_Ext1( EG_OPEN, 2018, NULL, NULL, 0, EF_CANDEFAULT ); + + /* NOTE: Under 'Standard' behaviour, this error does not allow 'retry' + but if you should wish to make it so, then or EF_CANRETRY + with EF_CANDEFAULT above) + */ + + if( uiAction == E_RETRY ) + continue; + } + break; } } @@ -184,7 +179,7 @@ HB_FUNC( DISKSPACE ) memcpy( &i64RetVal, &i64TotalBytes, sizeof( ULARGE_INTEGER ) ); } - #if defined(__GNUC__) || defined(_MSC_VER) + #if (defined(__GNUC__) || defined(_MSC_VER)) && !defined(__RSXNT__) dSpace = ( double ) i64RetVal.LowPart + ( double ) i64RetVal.HighPart + @@ -286,7 +281,7 @@ HB_FUNC( DISKSPACE ) USHORT rc; /* Query level 1 info from filesystem */ - while( ( rc = DosQueryFSInfo( uiDrive, 1, &fsa, sizeof( fsa )) ) != 0 ) + while( ( rc = DosQueryFSInfo( uiDrive, 1, &fsa, sizeof( fsa ) ) ) != 0 ) { USHORT uiAction = hb_errRT_BASE_Ext1( EG_OPEN, 2018, NULL, NULL, 0, EF_CANDEFAULT ); diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index ce6ec489cf..9bf8f2464b 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -852,39 +852,39 @@ BOOL hb_fsLock ( FHANDLE hFileHandle, ULONG ulStart, s_uiErrorLast = errno; #elif defined(HB_OS_OS2) - - { - /* 08/04/2000 - maurilio.longo@libero.it */ - struct _FILELOCK fl, ful; + + { + /* 08/04/2000 - maurilio.longo@libero.it */ + struct _FILELOCK fl, ful; errno = 0; - switch(uiMode) { - case FL_LOCK: - - fl.lOffset = ulStart; - fl.lRange = ulLength; - ful.lOffset = 0; - ful.lRange = 0; - - /* lock region, 2 seconds timeout, exclusive access - no atomic */ - iResult = (int) DosSetFileLocks(hFileHandle, &ful, &fl, 2000L, 0L); - break; + switch(uiMode) { + case FL_LOCK: - case FL_UNLOCK: - - fl.lOffset = 0; - fl.lRange = 0; - ful.lOffset = ulStart; - ful.lRange = ulLength; - - /* unlock region, 2 seconds timeout, exclusive access - no atomic */ - iResult = (int) DosSetFileLocks(hFileHandle, &ful, &fl, 2000L, 0L); - break; + fl.lOffset = ulStart; + fl.lRange = ulLength; + ful.lOffset = 0; + ful.lRange = 0; - default: - iResult = 0; - } + /* lock region, 2 seconds timeout, exclusive access - no atomic */ + iResult = (int) DosSetFileLocks(hFileHandle, &ful, &fl, 2000L, 0L); + break; + + case FL_UNLOCK: + + fl.lOffset = 0; + fl.lRange = 0; + ful.lOffset = ulStart; + ful.lRange = ulLength; + + /* unlock region, 2 seconds timeout, exclusive access - no atomic */ + iResult = (int) DosSetFileLocks(hFileHandle, &ful, &fl, 2000L, 0L); + break; + + default: + iResult = 0; + } s_uiErrorLast = errno; } @@ -965,12 +965,12 @@ void hb_fsCommit( FHANDLE hFileHandle ) } #elif defined(HB_OS_OS2) - - { + + { errno = 0; - /* 08/04/2000 - maurilio.longo@libero.it - TODO: what about error code from DosResetBuffer() call? */ + /* 08/04/2000 - maurilio.longo@libero.it + TODO: what about error code from DosResetBuffer() call? */ DosResetBuffer(hFileHandle); s_uiErrorLast = errno; @@ -1334,6 +1334,9 @@ FHANDLE hb_fsExtOpen( BYTE * pFilename, BYTE * pDefExt, return s_uiErrorLast; } +/* TOFIX: CA-Cl*pper will allow wildcards in the filename. This should be + added to Harbour. [vszakats] */ + BOOL hb_fsFile( BYTE * pFilename ) { BOOL bIsFile; diff --git a/harbour/source/rtl/gtdos/gtdos.c b/harbour/source/rtl/gtdos/gtdos.c index fa5e9fb423..3893bb3a07 100644 --- a/harbour/source/rtl/gtdos/gtdos.c +++ b/harbour/source/rtl/gtdos/gtdos.c @@ -61,7 +61,6 @@ #include "inkey.ch" #include -#include #include #include @@ -69,33 +68,14 @@ #include #include #include -#elif defined(__WATCOMC__) - #include #elif defined(_MSC_VER) #include #endif -#if defined(__WATCOMC__) - #if defined(__386__) && !defined(__WINDOWS_386__) - #define INT_86 int386 - #define DOS_REGS REGS - #else - #define INT_86 int86 - #define DOS_REGS REGS - #endif -#elif defined(_MSC_VER) - #define INT_86 _int86 - #define DOS_REGS _REGS -#else - #define INT_86 int86 - #define DOS_REGS REGS -#endif - /* For screen support */ -#if defined(__POWERC) || (defined(__TURBOC__) && !defined(__BORLANDC__)) || \ - (defined(__ZTC__) && !defined(__SC__)) +#if defined(__POWERC) || (defined(__TURBOC__) && !defined(__BORLANDC__)) || (defined(__ZTC__) && !defined(__SC__)) #define FAR far -#elif defined(HB_OS_DOS) && !defined(__DJGPP__) +#elif defined(HB_OS_DOS) && !defined(__DJGPP__) && !defined(__RSX32__) #define FAR _far #else #define FAR @@ -121,7 +101,7 @@ static void hb_gt_GetCursorSize( char * start, char * end ); #endif #include #endif -#ifndef __DJGPP__ +#if !defined(__DJGPP__) static char FAR * scrnPtr; static char FAR * scrnStealth = NULL; static char FAR * hb_gt_ScreenAddress( void ); @@ -130,7 +110,21 @@ static void hb_gt_GetCursorSize( char * start, char * end ); static BOOL s_bBreak; /* Used to signal Ctrl+Break to hb_inkeyPoll() */ static USHORT s_uiDispCount; -#ifndef __DJGPP__ +#if defined(__RSX32__) + +static int kbhit( void ) +{ + union REGS regs; + + regs.h.ah = 0x0B; + HB_DOS_INT86( 0x21, ®s, ®s ); + + return regs.x.ax; +} + +#endif + +#if !defined(__DJGPP__) && !defined(__RSX32__) #if defined(__WATCOMC__) || defined(_MSC_VER) static void hb_gt_CtrlBreak_Handler( int iSignal ) { @@ -155,10 +149,10 @@ static void hb_gt_CtrlBrkRestore( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_gt_CtrlBrkRestore()")); #if defined(__WATCOMC__) - signal( SIGBREAK, SIG_DFL); + signal( SIGBREAK, SIG_DFL ); #elif defined(_MSC_VER) - signal( SIGINT, SIG_DFL); - #else + signal( SIGINT, SIG_DFL ); + #elif !defined(__RSX32__) setcbrk( s_iOldCtrlBreak ); #endif } @@ -175,28 +169,41 @@ void hb_gt_Init( int iFilenoStdin, int iFilenoStdout, int iFilenoStderr ) s_bBreak = FALSE; s_uiDispCount = 0; + /* Set the Ctrl+Break handler [vszakats] */ + #if defined(__DJGPP__) + gppconio_init(); __djgpp_hwint_flags |= 2; /* Count Ctrl+Break instead of killing program */ __djgpp_set_ctrl_c( 0 ); /* Disable Ctrl+C */ __djgpp_set_sigquit_key( 0 ); /* Disable Ctrl+\ */ -#else - /* Set the Ctrl+Break handler [vszakats] */ +#elif defined(__WATCOMC__) - #if defined(__WATCOMC__) - signal( SIGBREAK, hb_gt_CtrlBreak_Handler ); - #elif defined(_MSC_VER) - signal( SIGINT, hb_gt_CtrlBreak_Handler ); - #else - ctrlbrk( hb_gt_CtrlBrkHandler ); - s_iOldCtrlBreak = getcbrk(); - setcbrk( 1 ); - #endif + signal( SIGBREAK, hb_gt_CtrlBreak_Handler ); atexit( hb_gt_CtrlBrkRestore ); +#elif defined(_MSC_VER) + + signal( SIGINT, hb_gt_CtrlBreak_Handler ); + atexit( hb_gt_CtrlBrkRestore ); + +#elif defined(__RSX32__) + + /* TODO */ + +#else + + ctrlbrk( hb_gt_CtrlBrkHandler ); + s_iOldCtrlBreak = getcbrk(); + setcbrk( 1 ); + atexit( hb_gt_CtrlBrkRestore ); + +#endif + /* */ +#if !defined(__DJGPP__) scrnStealth = ( char * ) -1; scrnPtr = hb_gt_ScreenAddress(); #endif @@ -206,7 +213,7 @@ void hb_gt_Done( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_gt_Done()")); -#ifndef __DJGPP__ +#if !defined(__DJGPP__) if( scrnStealth != ( char * ) -1 ) hb_xfree( scrnStealth ); #endif @@ -381,31 +388,18 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask ) BOOL hb_gt_AdjustPos( BYTE * pStr, ULONG ulLen ) { + union REGS regs; + HB_TRACE(HB_TR_DEBUG, ("hb_gt_AdjustPos(%s, %lu)", pStr, ulLen )); HB_SYMBOL_UNUSED( pStr ); HB_SYMBOL_UNUSED( ulLen ); -#if defined(__TURBOC__) - { - _AH = 0x03; - _BH = 0; - geninterrupt( 0x10 ); - hb_gtSetPos( _DH, _DL ); - } -#else - { - union REGS regs; - regs.h.ah = 0x03; - regs.h.bh = 0; -#if defined(__WATCOMC__) && defined(__386__) - int386( 0x10, ®s, ®s ); -#else - int86( 0x10, ®s, ®s ); -#endif - hb_gtSetPos( regs.h.dh, regs.h.dl ); - } -#endif + regs.h.ah = 0x03; + regs.h.bh = 0; + HB_DOS_INT86( 0x10, ®s, ®s ); + + hb_gtSetPos( regs.h.dh, regs.h.dl ); return TRUE; } @@ -417,7 +411,7 @@ BOOL hb_gt_IsColor( void ) return hb_gt_GetScreenMode() != 7; } -#ifndef __DJGPP__ +#if !defined(__DJGPP__) static char FAR * hb_gt_ScreenAddress() { char FAR * ptr; @@ -426,29 +420,21 @@ static char FAR * hb_gt_ScreenAddress() #if defined(__WATCOMC__) && defined(__386__) if( hb_gt_IsColor() ) - { ptr = ( char * ) ( 0xB800 << 4 ); - } else - { ptr = ( char * )( 0xB000 << 4 ); - } #else if( hb_gt_IsColor() ) - { ptr = ( char FAR * ) MK_FP( 0xB800, 0x0000 ); - } else - { ptr = ( char FAR * ) MK_FP( 0xB000, 0x0000 ); - } #endif return ptr; } #endif -#ifndef __DJGPP__ +#if !defined(__DJGPP__) char FAR * hb_gt_ScreenPtr( USHORT cRow, USHORT cCol ) { HB_TRACE(HB_TR_DEBUG, ("hb_gt_ScreenPtr(%hu, %hu)", cRow, cCol)); @@ -498,88 +484,40 @@ USHORT hb_gt_GetScreenHeight( void ) void hb_gt_SetPos( SHORT iRow, SHORT iCol ) { + union REGS regs; + HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetPos(%hd, %hd)", iRow, iCol)); -#if defined(__TURBOC__) - { - BYTE cRow, cCol; - cRow = ( BYTE ) iRow; - cCol = ( BYTE ) iCol; - - _AH = 0x02; - _BH = 0; - _DH = cRow; - _DL = cCol; - geninterrupt( 0x10 ); - } -#else - { - union REGS regs; - regs.h.ah = 0x02; - regs.h.bh = 0; - regs.h.dh = ( BYTE ) iRow; - regs.h.dl = ( BYTE ) iCol; -#if defined(__WATCOMC__) && defined(__386__) - int386( 0x10, ®s, ®s ); -#else - int86( 0x10, ®s, ®s ); -#endif - } -#endif + regs.h.ah = 0x02; + regs.h.bh = 0; + regs.h.dh = ( BYTE ) iRow; + regs.h.dl = ( BYTE ) iCol; + HB_DOS_INT86( 0x10, ®s, ®s ); } static void hb_gt_SetCursorSize( char start, char end ) { + union REGS regs; + HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetCursorSize(%d, %d)", (int) start, (int) end)); -#if defined(__TURBOC__) - { - _AH = 0x01; - _CH = start; - _CL = end; - geninterrupt( 0x10 ); - } -#else - { - union REGS regs; - regs.h.ah = 0x01; - regs.h.ch = start; - regs.h.cl = end; -#if defined(__WATCOMC__) && defined(__386__) - int386( 0x10, ®s, ®s ); -#else - int86( 0x10, ®s, ®s ); -#endif - } -#endif + regs.h.ah = 0x01; + regs.h.ch = start; + regs.h.cl = end; + HB_DOS_INT86( 0x10, ®s, ®s ); } static void hb_gt_GetCursorSize( char * start, char *end ) { + union REGS regs; + HB_TRACE(HB_TR_DEBUG, ("hb_gt_GetCursorSize(%p, %p)", start, end)); -#if defined(__TURBOC__) - { - _AH = 0x03; - _BH = 0; - geninterrupt( 0x10 ); - *start = _CH; - *end = _CL; - } -#else - { - union REGS regs; - regs.h.ah = 0x03; - regs.h.bh = 0; -#if defined(__WATCOMC__) && defined(__386__) - int386( 0x10, ®s, ®s ); -#else - int86( 0x10, ®s, ®s ); -#endif - *start = regs.h.ch; - *end = regs.h.cl; - } -#endif + regs.h.ah = 0x03; + regs.h.bh = 0; + HB_DOS_INT86( 0x10, ®s, ®s ); + *start = regs.h.ch; + *end = regs.h.cl; } USHORT hb_gt_GetCursorStyle( void ) @@ -812,54 +750,28 @@ void hb_gt_SetAttribute( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT us SHORT hb_gt_Col( void ) { + union REGS regs; + HB_TRACE(HB_TR_DEBUG, ("hb_gt_Col()")); -#if defined(__TURBOC__) - { - _AH = 0x03; - _BH = 0; - geninterrupt( 0x10 ); - return _DL; - } -#else - { - union REGS regs; - regs.h.ah = 0x03; - regs.h.bh = 0; -#if defined(__WATCOMC__) && defined(__386__) - int386( 0x10, ®s, ®s ); -#else - int86( 0x10, ®s, ®s ); -#endif - return regs.h.dl; - } -#endif + regs.h.ah = 0x03; + regs.h.bh = 0; + HB_DOS_INT86( 0x10, ®s, ®s ); + + return regs.h.dl; } SHORT hb_gt_Row( void ) { + union REGS regs; + HB_TRACE(HB_TR_DEBUG, ("hb_gt_Row()")); -#if defined(__TURBOC__) - { - _AH = 0x03; - _BH = 0; - geninterrupt( 0x10 ); - return _DH; - } -#else - { - union REGS regs; - regs.h.ah = 0x03; - regs.h.bh = 0; -#if defined(__WATCOMC__) && defined(__386__) - int386( 0x10, ®s, ®s ); -#else - int86( 0x10, ®s, ®s ); -#endif - return regs.h.dh; - } -#endif + regs.h.ah = 0x03; + regs.h.bh = 0; + HB_DOS_INT86( 0x10, ®s, ®s ); + + return regs.h.dh; } void hb_gt_Scroll( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight, BYTE attr, SHORT sVert, SHORT sHoriz ) @@ -933,7 +845,7 @@ void hb_gt_DispBegin( void ) HB_TRACE(HB_TR_DEBUG, ("hb_gt_DispBegin()")); /* ptucker */ -#ifndef __DJGPP__ +#if !defined(__DJGPP__) if( ++s_uiDispCount == 1 ) { char FAR * ptr; @@ -955,7 +867,7 @@ void hb_gt_DispEnd( void ) HB_TRACE(HB_TR_DEBUG, ("hb_gt_DispEnd()")); /* ptucker */ -#ifndef __DJGPP__ +#if !defined(__DJGPP__) if( --s_uiDispCount == 0 ) { char FAR * ptr; @@ -1006,28 +918,15 @@ BOOL hb_gt_GetBlink() void hb_gt_SetBlink( BOOL bBlink ) { + union REGS regs; + HB_TRACE(HB_TR_DEBUG, ("hb_gt_SetBlink(%d)", (int) bBlink)); -#if defined(__TURBOC__) - { - _AX = 0x1003; - _BX = bBlink; - geninterrupt( 0x10 ); - } -#else - { - union REGS regs; - regs.h.ah = 0x10; - regs.h.al = 0x03; - regs.h.bh = 0; - regs.h.bl = bBlink; -#if defined(__WATCOMC__) && defined(__386__) - int386( 0x10, ®s, ®s ); -#else - int86( 0x10, ®s, ®s ); -#endif - } -#endif + regs.h.ah = 0x10; + regs.h.al = 0x03; + regs.h.bh = 0; + regs.h.bl = bBlink; + HB_DOS_INT86( 0x10, ®s, ®s ); } void hb_gt_Tone( double dFrequency, double dDuration ) diff --git a/harbour/source/rtl/gtdos/mousedos.c b/harbour/source/rtl/gtdos/mousedos.c index b851d71d17..984444bed7 100644 --- a/harbour/source/rtl/gtdos/mousedos.c +++ b/harbour/source/rtl/gtdos/mousedos.c @@ -34,19 +34,6 @@ * */ -/* TOFIX: Change this to something better */ -/* #define BORLANDC */ - -#if defined(__DJGPP__) || defined(__BORLANDC__) - #define MOUSE_INTERRUPT 0x33 - #include -#endif - -#if defined(_MSC_VER) - #define MOUSE_INTERRUPT 0x33 - #include -#endif - #include "hbapigt.h" /* C callable low-level interface */ @@ -59,19 +46,12 @@ static int s_iInitRow = 0; /* Init mouse pos */ void hb_mouse_Init( void ) { - /* TODO: */ + union REGS regs; -#if defined(__DJGPP__) || defined(__BORLANDC__) - { - union REGS regs; - - regs.x.ax = 0; - int86( MOUSE_INTERRUPT, ®s, ®s ); - - s_bPresent = regs.x.ax; - s_iButtons = regs.x.bx; - } -#endif + regs.x.ax = 0; + HB_DOS_INT86( 0x33, ®s, ®s ); + s_bPresent = regs.x.ax; + s_iButtons = regs.x.bx; if( s_bPresent ) { @@ -93,83 +73,63 @@ BOOL hb_mouse_IsPresent( void ) void hb_mouse_Show( void ) { - /* TODO: */ - if( s_bPresent ) { -#if defined(__DJGPP__) || defined(__BORLANDC__) union REGS regs; regs.x.ax = 1; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); s_iCursorVisible = TRUE; -#endif } } void hb_mouse_Hide( void ) { - /* TODO: */ - if( s_bPresent ) { -#if defined(__DJGPP__) || defined(__BORLANDC__) union REGS regs; regs.x.ax = 2; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); s_iCursorVisible = FALSE; -#endif } } int hb_mouse_Col( void ) { - /* TODO: */ - if( s_bPresent ) { -#if defined(__DJGPP__) || defined(__BORLANDC__) union REGS regs; regs.x.ax = 3; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); return regs.x.cx / 8; -#else - return 0; -#endif } - - return -1; + else + return -1; } int hb_mouse_Row( void ) { if( s_bPresent ) { -#if defined(__DJGPP__) || defined(__BORLANDC__) union REGS regs; regs.x.ax = 3; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); return regs.x.dx / 8; -#else - return 0; -#endif } - - return -1; + else + return -1; } void hb_mouse_SetPos( int iRow, int iCol ) { - /* TODO: */ - if( s_bPresent ) { union REGS regs; @@ -177,58 +137,45 @@ void hb_mouse_SetPos( int iRow, int iCol ) regs.x.ax = 4; regs.x.cx = iRow * 8; regs.x.dx = iCol * 8; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); } } BOOL hb_mouse_IsButtonPressed( int iButton ) { - /* TODO: */ - if( s_bPresent ) { -#if defined(__DJGPP__) || defined(__BORLANDC__) union REGS regs; regs.x.ax = 5; regs.x.bx = iButton; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); - return regs.x.bx; -#else - return FALSE; -#endif + return regs.x.bx ? TRUE : FALSE; } - - return FALSE; + else + return FALSE; } int hb_mouse_CountButton( void ) { - /* TODO: */ - if( s_bPresent ) { -#if defined(__DJGPP__) || defined(__BORLANDC__) union REGS regs; regs.x.ax = 3; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); return regs.x.bx; -#endif } - - return 0; + else + return 0; } void hb_mouse_SetBounds( int iTop, int iLeft, int iBottom, int iRight ) { - /* TODO: */ - if( s_bPresent ) { -#if defined(__DJGPP__) || defined(__BORLANDC__) union REGS regs; iLeft *= 8; @@ -237,7 +184,7 @@ void hb_mouse_SetBounds( int iTop, int iLeft, int iBottom, int iRight ) regs.x.ax = 7; regs.x.cx = iLeft; regs.x.dx = iRight; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); iTop *= 8; iBottom *= 8; @@ -245,8 +192,7 @@ void hb_mouse_SetBounds( int iTop, int iLeft, int iBottom, int iRight ) regs.x.ax = 8; regs.x.cx = iTop; regs.x.dx = iBottom; - int86( MOUSE_INTERRUPT, ®s, ®s ); -#endif + HB_DOS_INT86( 0x33, ®s, ®s ); } } @@ -254,19 +200,17 @@ void hb_mouse_GetBounds( int * piTop, int * piLeft, int * piBottom, int * piRigh { if( s_bPresent ) { -#if defined(__DJGPP__) || defined(__BORLANDC__) union REGS regs; regs.x.ax = 7; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); *piLeft = regs.x.cx / 8; *piRight = regs.x.dx / 8; regs.x.ax = 8; - int86( MOUSE_INTERRUPT, ®s, ®s ); + HB_DOS_INT86( 0x33, ®s, ®s ); *piTop = regs.x.cx / 8; *piBottom = regs.x.dx / 8; -#endif } } diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c index d515fc7016..6fc9073c5d 100644 --- a/harbour/source/rtl/gtwin/gtwin.c +++ b/harbour/source/rtl/gtwin/gtwin.c @@ -85,6 +85,21 @@ typedef WORD far * LPWORD; #endif +#if defined(__RSXNT__) + #ifndef FROM_LEFT_1ST_BUTTON_PRESSED + #define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 + #endif + #ifndef RIGHTMOST_BUTTON_PRESSED + #define RIGHTMOST_BUTTON_PRESSED 0x0002 + #endif + #ifndef MOUSE_MOVED + #define MOUSE_MOVED 0x0001 + #endif + #ifndef DOUBLE_CLICK + #define DOUBLE_CLICK 0x0002 + #endif +#endif + #if 0 static HANDLE s_HOsave; /* work in progress */ static HANDLE s_HDOutput; diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c index 1d48f15cdd..127be8bf7e 100644 --- a/harbour/source/rtl/inkey.c +++ b/harbour/source/rtl/inkey.c @@ -53,8 +53,6 @@ #define INCL_NOPMAPI #endif -#define HB_OS_WIN_32_USED - #include "hbapi.h" #include "hbapierr.h" #include "hbapiitm.h" @@ -63,42 +61,8 @@ #include "hbset.h" #include "inkey.ch" -#if defined(__TURBOC__) || defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__) - #include - #include -#elif defined(__DJGPP__) - #include - #include - #include -#elif defined(HARBOUR_GCC_OS2) - #include -#elif defined(__IBMCPP__) - #include - #include -#endif #include -#if defined(__WATCOMC__) - #include - #include - #if defined(__386__) && !defined(__WINDOWS_386__) - #define INT_86 int386 - #define DOS_REGS REGS - #else - #define INT_86 int86 - #define DOS_REGS REGS - #endif -#elif defined(__EMX__) - #define INT_86 _int86 - #define DOS_REGS REGS -#elif defined(_MSC_VER) - #define INT_86 _int86 - #define DOS_REGS _REGS -#else - #define INT_86 int86 - #define DOS_REGS REGS -#endif - #if defined(HARBOUR_GCC_OS2) ULONG DosSleep( ULONG ulMilliseconds ); #endif @@ -113,43 +77,39 @@ static HB_inkey_enum s_eventmask; void hb_releaseCPU( void ) { -/* TODO: Add code to release time slices on all platforms */ -#if defined(_WINDOWS_) || defined(__MINGW32__) + HB_TRACE(HB_TR_DEBUG, ("releaseCPU()")); + + /* TODO: Add code to release time slices on all platforms */ + +#if defined(HB_OS_WIN_32) /* according to ms docs, you should not do this in a Win app. dos only */ #elif defined(HB_OS_OS2) DosSleep( 25 ); /* Duration is in milliseconds */ #elif defined(HB_OS_DOS) -/* NOTE: there is a bug under NT 4 and 2000 - if the app is running - in protected mode, time slices will _not_ be released - you must switch - to real mode first, execute the following, and switch back. - It just occurred to me that this is actually by design. Since MS doesn't - want you to do this from a console app, their solution was to not allow - the call to work in protected mode - screw the rest of the planet . + /* NOTE: there is a bug under NT 4 and 2000 - if the app is running + in protected mode, time slices will _not_ be released - you must switch + to real mode first, execute the following, and switch back. + + It just occurred to me that this is actually by design. Since MS doesn't + want you to do this from a console app, their solution was to not allow + the call to work in protected mode - screw the rest of the planet . + + returns zero on failure. (means not supported) + */ - returns zero on failure. (means not supported) - */ - #if defined(__TURBOC__) - _AX = 0x1680; - geninterrupt( 0x2f ); - _AH = 0; - _AL ^= 0x80; - #elif ! defined(__DJGPP__) + { union REGS regs; - regs.h.ah = 0x16; - regs.h.al = 0x80; - #if defined(__WATCOMC__) && defined(__386__) - int386( 0x2f, ®s, ®s ); - #else - int86( 0x2f, ®s, ®s ); - #endif - regs.h.ah = 0; - regs.h.al ^= 0x80; - #endif -#elif defined(OS_UNIX_COMPATIBLE) + + regs.h.ah = 2; + regs.x.ax = 0x1680; + + HB_DOS_INT86( 0x2F, ®s, ®s ); + } + +#elif defined(HB_OS_UNIX) #else #endif - HB_TRACE(HB_TR_DEBUG, ("releaseCPU()")); } int hb_inkey( double seconds, HB_inkey_enum event_mask, BOOL wait, BOOL forever ) diff --git a/harbour/source/rtl/is.c b/harbour/source/rtl/is.c index a573702117..54c4a5e041 100644 --- a/harbour/source/rtl/is.c +++ b/harbour/source/rtl/is.c @@ -43,7 +43,7 @@ HB_FUNC( ISALPHA ) { - hb_retl( isalpha( *hb_parc( 1 ) ) ); + hb_retl( isalpha( ( int ) *hb_parc( 1 ) ) ); } /* determines if first char of string is digit */ @@ -52,7 +52,7 @@ HB_FUNC( ISALPHA ) HB_FUNC( ISDIGIT ) { - hb_retl( isdigit( *hb_parc( 1 ) ) ); + hb_retl( isdigit( ( int ) *hb_parc( 1 ) ) ); } /* determines if first char of string is upper-case */ @@ -61,7 +61,7 @@ HB_FUNC( ISDIGIT ) HB_FUNC( ISUPPER ) { - hb_retl( isupper( *hb_parc( 1 ) ) ); + hb_retl( isupper( ( int ) *hb_parc( 1 ) ) ); } /* determines if first char of string is lower-case */ @@ -70,6 +70,6 @@ HB_FUNC( ISUPPER ) HB_FUNC( ISLOWER ) { - hb_retl( islower( *hb_parc( 1 ) ) ); + hb_retl( islower( ( int ) *hb_parc( 1 ) ) ); } diff --git a/harbour/source/rtl/isprint.c b/harbour/source/rtl/isprint.c index f81b77fdc8..161fd79b3d 100644 --- a/harbour/source/rtl/isprint.c +++ b/harbour/source/rtl/isprint.c @@ -38,31 +38,6 @@ #include "hbapi.h" #include "hbapifs.h" -#if defined(__TURBOC__) || defined(__BORLANDC__) || defined(_MSC_VER) || defined(__DJGPP__) - #include -#endif - -#if defined(__WATCOMC__) - #include - #if defined(__386__) && !defined(__WINDOWS_386__) - #define INT_86 int386 - #else - #define INT_86 int86 - #endif -#else - #if defined(__EMX__) - #define INT_86 _int86 - #else - #define INT_86 int86 - #endif -#endif - -#if defined(__TURBOC__) || defined(__BORLANDC__) || defined(_MSC_VER) || defined(__DJGPP__) - #if !(defined(_Windows) || defined(__NT__) || defined(WINNT) || defined(_WINDOWS_)) - #define HB_LOCAL_DOS - #endif -#endif - /* NOTE: The parameter is an extension over CA-Cl*pper, it's also supported by Xbase++. [vszakats] */ @@ -72,7 +47,7 @@ HB_FUNC( ISPRINTER ) USHORT uiPort = atoi( pszDOSPort + 3 ); BOOL bIsPrinter = FALSE; -#if defined(HB_LOCAL_DOS) +#if defined(HB_OS_DOS) /* NOTE: DOS specific solution, using BIOS interrupt */ @@ -81,13 +56,9 @@ HB_FUNC( ISPRINTER ) union REGS regs; regs.h.ah = 2; - #if defined(__BORLANDC__) || defined(_MSC_VER) regs.x.dx = uiPort - 1; - #else - regs.w.dx = uiPort - 1; - #endif - INT_86( 0x17, ®s, ®s ); + HB_DOS_INT86( 0x17, ®s, ®s ); bIsPrinter = ( regs.h.ah == 0x90 ); } diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c index bc0ddea5cb..c439aaa62c 100644 --- a/harbour/source/rtl/transfrm.c +++ b/harbour/source/rtl/transfrm.c @@ -277,7 +277,7 @@ static char * NumPicture( char * szPic, ULONG ulPicLen, USHORT * puiPicFlags, do } else if( cPic == ',' ) /* Comma */ { - if( iCount && isdigit( szStr[ iCount - 1 ] ) ) + if( iCount && isdigit( ( int ) szStr[ iCount - 1 ] ) ) { /* May we place it */ if( uiPicFlags & PF_EXCHANG ) szResult[ i ] = '.'; @@ -293,11 +293,11 @@ static char * NumPicture( char * szPic, ULONG ulPicLen, USHORT * puiPicFlags, do if( ( uiPicFlags & PF_PARNEG ) && ( dValue < 0 ) ) { - if( isdigit( *szResult ) ) /* Overflow */ + if( isdigit( ( int ) *szResult ) ) /* Overflow */ { for( iCount = 1; ( ULONG ) iCount < i; iCount++ ) { - if( isdigit( szResult[ iCount ] ) ) + if( isdigit( ( int ) szResult[ iCount ] ) ) szResult[ iCount ] = '*'; } } diff --git a/harbour/source/rtl/version.c b/harbour/source/rtl/version.c index d23c16a6ad..eed006a9ea 100644 --- a/harbour/source/rtl/version.c +++ b/harbour/source/rtl/version.c @@ -60,25 +60,9 @@ HB_FUNC( HB_COMPILER ) hb_xfree( pszCompiler ); } -/* NOTE: The parameter accepted is a Harbour extension. */ - HB_FUNC( VERSION ) { char * pszVersion = hb_verHarbour(); - - if( hb_pcount() > 0 ) - { - char * pszCompiler = hb_verCompiler(); - - pszVersion = ( char * ) hb_xrealloc( pszVersion, strlen( pszVersion ) + strlen( pszCompiler ) + ( 4 * sizeof( char ) ) ); - - strcat( pszVersion, " (" ); - strcat( pszVersion, pszCompiler ); - strcat( pszVersion, ")" ); - - hb_xfree( pszCompiler ); - } - hb_retc( pszVersion ); hb_xfree( pszVersion ); } diff --git a/harbour/source/vm/extend.c b/harbour/source/vm/extend.c index 6523bfe2a1..40016b1cc4 100644 --- a/harbour/source/vm/extend.c +++ b/harbour/source/vm/extend.c @@ -43,6 +43,9 @@ * hb_retnllen() * hb_retndlen() * + * Copyright 2000 Jose Lalin + * hb_retd() + * * See doc/license.txt for licensing terms. * */ @@ -488,6 +491,13 @@ void hb_retds( char * szDate ) hb_itemPutDS( &hb_stack.Return, szDate ); } +void hb_retd( long lDay, long lMonth, long lYear ) +{ + HB_TRACE(HB_TR_DEBUG, ("hb_retd(%02i, %02i, %04i)", lDay, lMonth, lYear)); + + hb_itemPutDL( &hb_stack.Return, hb_dateEncode( lDay, lMonth, lYear ) ); +} + void hb_retl( int iLogical ) { HB_TRACE(HB_TR_DEBUG, ("hb_retl(%d)", iLogical)); diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c index fe6392149e..a9484d453e 100644 --- a/harbour/source/vm/fm.c +++ b/harbour/source/vm/fm.c @@ -351,6 +351,8 @@ ULONG hb_xsize( void * pMem ) /* returns the size of an allocated memory block * #ifdef HB_FM_STATISTICS return ( ( PHB_MEMINFO ) ( ( char * ) pMem - sizeof( HB_MEMINFO ) ) )->ulSize; #else + HB_SYMBOL_UNUSED( pMem ); + return 0; #endif } diff --git a/harbour/source/vm/maindll.c b/harbour/source/vm/maindll.c index 67499c96f6..3612d13b1b 100644 --- a/harbour/source/vm/maindll.c +++ b/harbour/source/vm/maindll.c @@ -33,11 +33,12 @@ * */ -#if defined(_Windows) || defined(_WIN32) +#define HB_OS_WIN_32_USED -#include #include "hbvm.h" +#if defined(HB_OS_WIN_32) + #if defined(__BORLANDC__) BOOL WINAPI _export #else diff --git a/harbour/source/vm/mainwin.c b/harbour/source/vm/mainwin.c index 9c83f38b27..61929cfc82 100644 --- a/harbour/source/vm/mainwin.c +++ b/harbour/source/vm/mainwin.c @@ -33,12 +33,13 @@ * */ -#if defined(_Windows) || defined(_WIN32) +#define HB_OS_WIN_32_USED -#include #include "hbapi.h" #include "hbvm.h" +#if defined(HB_OS_WIN_32) + HANDLE hb_hInstance = 0; HANDLE hb_hPrevInstance = 0; diff --git a/harbour/tests/version.prg b/harbour/tests/version.prg index 7db8fd450f..d5a6694f9a 100644 --- a/harbour/tests/version.prg +++ b/harbour/tests/version.prg @@ -11,7 +11,6 @@ function Main() outstd( chr( 34 ) + version() + chr( 34 ) + hb_osnewline() ) - outstd( chr( 34 ) + version( NIL ) + chr( 34 ) + hb_osnewline() ) outstd( chr( 34 ) + hb_compiler() + chr( 34 ) + hb_osnewline() ) outstd( chr( 34 ) + os() + chr( 34 ) + hb_osnewline() ) diff --git a/harbour/utils/hbtest/hbtest.prg b/harbour/utils/hbtest/hbtest.prg index 2047b754e1..4e6d6fe187 100644 --- a/harbour/utils/hbtest/hbtest.prg +++ b/harbour/utils/hbtest/hbtest.prg @@ -217,12 +217,12 @@ STATIC FUNCTION TEST_BEGIN( cParam ) /* Feedback */ - /* NOTE: The 0 parameter of Version() will force Harbour to include the - compiler version in the version string. */ - FWrite( s_nFhnd, "---------------------------------------------------------------------------" + HB_OSNewLine() +; - " Version: " + Version( 0 ) + HB_OSNewLine() +; - " OS: " + OS() + HB_OSNewLine() +; + " Version: " + Version() + HB_OSNewLine() ) +#ifdef __HARBOUR__ + FWrite( s_nFhnd, " Compiler: " + HB_Compiler() + HB_OSNewLine() ) +#endif + FWrite( s_nFhnd, " OS: " + OS() + HB_OSNewLine() +; " Date, Time: " + DToC( Date() ) + " " + Time() + HB_OSNewLine() +; " Output: " + s_cFileName + HB_OSNewLine() +; "Shortcut opt.: " + iif( s_lShortcut, "ON", "OFF" ) + HB_OSNewLine() +;