20000129-19:15 GMT+1 Victor Szel <info@szelvesz.hu>

This commit is contained in:
Viktor Szakats
2000-01-30 09:19:13 +00:00
parent 818c0a0200
commit 28b5f0bb8e
7 changed files with 35 additions and 22 deletions

View File

@@ -1,3 +1,14 @@
20000129-19:15 GMT+1 Victor Szel <info@szelvesz.hu>
* bin/bld_tpl.*
! Added macro lib.
! Fix for os2 platform.
* source/rtl/tget.prg
- Removed #include "set.ch" since it's included by default (via std.ch)
* source/rtl/Makefile
source/rtl/memoline.c
source/rtl/filesys.c
* Some minor formatting fixes.
20000129-14:30 GMT+3 Luiz Rafael Culik <culik@sl.conex.net>
*source/rtl/oemansi.c
*Added documentation to HB_oemtoansi() and Hb_ansitooem()

View File

@@ -79,33 +79,33 @@ rem set HB_COMPILER=
if not "%HB_ARCHITECTURE%" == "dos" goto A_W32
if "%HB_COMPILER%" == "bcc31" bcc -O2 -mh -I..\include %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "djgpp" gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfnt -ldbfcd -lcommon
if "%HB_COMPILER%" == "bcc31" bcc -O2 -mh -I..\include %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "djgpp" gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfnt -ldbfcd -lcommon
goto END
:A_W32
if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "mingw32" gcc %1.c -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "mingw32" gcc %1.c -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\macro.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning
goto END
:A_OS2
if not "%HB_ARCHITECTURE%" == "dos" goto A_LINUX
if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
goto END
:A_LINUX
if not "%HB_ARCHITECTURE%" == "linux" goto CLEANUP
if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
goto END
:CLEANUP

View File

@@ -79,33 +79,33 @@ rem set HB_COMPILER=
if not "%HB_ARCHITECTURE%" == "dos" goto A_W32
if "%HB_COMPILER%" == "bcc31" bcc -O2 -mh -I..\include %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "djgpp" gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfnt -ldbfcd -lcommon
if "%HB_COMPILER%" == "bcc31" bcc -O2 -mh -I..\include %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "djgpp" gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfnt -ldbfcd -lcommon
goto END
:A_W32
if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "mingw32" gcc %1.c -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "mingw32" gcc %1.c -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "msvc" cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\macro.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning
goto END
:A_OS2
if not "%HB_ARCHITECTURE%" == "dos" goto A_LINUX
if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
if "%HB_COMPILER%" == "gcc" gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
goto END
:A_LINUX
if not "%HB_ARCHITECTURE%" == "linux" goto CLEANUP
if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
if "%HB_COMPILER%" == "gcc" gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
goto END
:CLEANUP

View File

@@ -35,7 +35,7 @@ C_SOURCES=\
memoline.c \
memvars.c \
mlcount.c \
mlpos.c \
mlpos.c \
mouseapi.c \
mtran.c \
natmsg.c \

View File

@@ -2143,6 +2143,7 @@ HARBOUR HB_FILE( void )
{
hb_retl( ISCHAR( 1 ) ? hb_fsFile( ( BYTE * ) hb_parc( 1 ) ) : FALSE );
}
/* $DOC$
* $FUNCNAME$
* FREADSTR()
@@ -2464,7 +2465,9 @@ HARBOUR HB_FSETDEVMOD( void )
}
#endif
/* HARBOUR COMMAND THAT ARE PREPROCESSED IN FUNTION */
/* HARBOUR COMMANDS THAT ARE PREPROCESSED INTO FUNCTIONS */
/* $DOC$
* $FUNCNAME$
* RENAME

View File

@@ -70,7 +70,7 @@ HARBOUR HB_MEMOLINE( void )
case HB_CHAR_LF:
ulCurLength = 0;
ulLastSpace = 0;
ulLineEnd = HB_MAX_( ulPos - 2, ulLineBegin ) ;
ulLineEnd = HB_MAX_( ulPos - 2, ulLineBegin );
ulLines++;
if( ulLines < ulLineNumber )
{

View File

@@ -35,7 +35,6 @@
#include "setcurs.ch"
#include "getexit.ch"
#include "inkey.ch"
#include "set.ch"
#define GET_CLR_UNSELECTED 0
#define GET_CLR_ENHANCED 1