From b9efd5247ef3d0a367071fbc30819dc7ce6d6c7f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 23 Apr 2000 10:19:50 +0000 Subject: [PATCH] 20000423-12:23 GMT+1 Victor Szakats --- harbour/ChangeLog | 23 ++++ harbour/bin/bld.bat | 20 ++- harbour/bin/bld.cmd | 20 ++- harbour/bin/bld.sh | 22 +-- harbour/contrib/libct/ctchrodd.c | 2 +- harbour/contrib/libct/make_b32.bat | 29 ++++ harbour/contrib/libct/make_vc.bat | 29 ++++ harbour/contrib/libct/makefile.bc | 162 ++++++++++++++++++++++ harbour/contrib/libct/makefile.vc | 152 +++++++++++++++++++++ harbour/contrib/libct/readme.txt | 4 +- harbour/contrib/libgt/make_b32.bat | 29 ++++ harbour/contrib/libgt/make_vc.bat | 29 ++++ harbour/contrib/libgt/makefile.bc | 195 +++++++++++++++++++++++++++ harbour/contrib/libgt/makefile.vc | 159 ++++++++++++++++++++++ harbour/contrib/libmisc/make_b32.bat | 29 ++++ harbour/contrib/libmisc/make_vc.bat | 29 ++++ harbour/contrib/libmisc/makefile.bc | 181 +++++++++++++++++++++++++ harbour/contrib/libmisc/makefile.vc | 178 ++++++++++++++++++++++++ 18 files changed, 1256 insertions(+), 36 deletions(-) create mode 100644 harbour/contrib/libct/make_b32.bat create mode 100644 harbour/contrib/libct/make_vc.bat create mode 100644 harbour/contrib/libct/makefile.bc create mode 100644 harbour/contrib/libct/makefile.vc create mode 100644 harbour/contrib/libgt/make_b32.bat create mode 100644 harbour/contrib/libgt/make_vc.bat create mode 100644 harbour/contrib/libgt/makefile.bc create mode 100644 harbour/contrib/libgt/makefile.vc create mode 100644 harbour/contrib/libmisc/make_b32.bat create mode 100644 harbour/contrib/libmisc/make_vc.bat create mode 100644 harbour/contrib/libmisc/makefile.bc create mode 100644 harbour/contrib/libmisc/makefile.vc diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a8d011f5ba..18886e96ed 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,26 @@ +20000423-12:23 GMT+1 Victor Szakats + + + contrib/libct/makefile.bc + + contrib/libct/makefile.vc + + contrib/libgt/makefile.bc + + contrib/libgt/makefile.vc + + contrib/libmisc/makefile.bc + + contrib/libmisc/makefile.vc + + contrib/libct/make_b32.bat + + contrib/libct/make_vc.bat + + contrib/libgt/make_b32.bat + + contrib/libgt/make_vc.bat + + contrib/libmisc/make_b32.bat + + contrib/libmisc/make_vc.bat + + Added makefiles + + * contrib/libct/ctchrodd.c + * contrib/libct/readme.txt + ! Fixed bug. + + * bin/bld.* + - Removed tools. + 20000423-11:38 GMT+1 Victor Szakats + contrib/libct/* diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index ece9e199fd..6e35965dbe 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -111,7 +111,6 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= echo -O2 -d -mh %CFLAGS% -I..\include -L..\lib > build.tmp echo -e%1.exe %1.c >> build.tmp - echo tools.lib >> build.tmp echo debug.lib >> build.tmp echo vm.lib >> build.tmp echo rtl.lib >> build.tmp @@ -132,7 +131,6 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT echo %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib > build.tmp - echo -ltools >> build.tmp echo -ldebug >> build.tmp echo -lvm >> build.tmp echo -lrtl >> build.tmp @@ -152,7 +150,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= :A_DOS_DJGPP_NOT - if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon goto END :A_W32 @@ -161,11 +159,11 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin - if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib - if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib + if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I..\include -L..\lib %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib + if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I..\include %1.c /link /subsystem:CONSOLE ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning goto END @@ -176,8 +174,8 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2 - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I..\include %1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I..\include %1.c ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib goto END :A_LINUX @@ -186,7 +184,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I../include -L../lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I../include -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon goto END :CLEANUP diff --git a/harbour/bin/bld.cmd b/harbour/bin/bld.cmd index 7bbc3ca4c0..8e103d18e5 100644 --- a/harbour/bin/bld.cmd +++ b/harbour/bin/bld.cmd @@ -111,7 +111,6 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= echo -O2 -d -mh %CFLAGS% -I..\include -L..\lib > build.tmp echo -e%1.exe %1.c >> build.tmp - echo tools.lib >> build.tmp echo debug.lib >> build.tmp echo vm.lib >> build.tmp echo rtl.lib >> build.tmp @@ -132,7 +131,6 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT echo %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib > build.tmp - echo -ltools >> build.tmp echo -ldebug >> build.tmp echo -lvm >> build.tmp echo -lrtl >> build.tmp @@ -152,7 +150,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= :A_DOS_DJGPP_NOT - if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "rsx32" gcc %1.c -Zrsx32 %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon goto END :A_W32 @@ -161,11 +159,11 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin - if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I..\include -L..\lib %1.c tools.lib debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib - if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib + if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I..\include -L..\lib %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib + if "%HB_COMPILER%" == "gcc" gcc %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "rsxnt" gcc %1.c -Zwin32 %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "msvc" cl -TP -W3 %CFLAGS% -I..\include %1.c /link /subsystem:CONSOLE ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib if "%HB_COMPILER%" == "msvc" echo Ignore LNK4033 warning goto END @@ -176,8 +174,8 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2 - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon - if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I..\include %1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "icc" icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I..\include %1.c ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib goto END :A_LINUX @@ -186,7 +184,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB= if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd - if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I../include -L../lib -ltools -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + if "%HB_COMPILER%" == "gcc" gcc %1.c %CFLAGS% -I../include -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon goto END :CLEANUP diff --git a/harbour/bin/bld.sh b/harbour/bin/bld.sh index 97d8f5888b..56e3713e4b 100644 --- a/harbour/bin/bld.sh +++ b/harbour/bin/bld.sh @@ -84,11 +84,11 @@ else if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtdos; fi if [ "$HB_COMPILER" == "bcc16" ]; then - bcc -O2 -mh -d $CFLAGS -I..\include -L..\lib $1.c tools.lib debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib + bcc -O2 -mh -d $CFLAGS -I..\include -L..\lib $1.c debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib elif [ "$HB_COMPILER" == "djgpp" ]; then - gcc $1.c -o$1.exe $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommo + gcc $1.c -o$1.exe $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommo elif [ "$HB_COMPILER" == "rsx32" ]; then - gcc $1.c -Zrsx32 $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c -Zrsx32 $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon else echo Error: HB_COMPILER value is unsupported. fi @@ -98,15 +98,15 @@ else if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtwin; fi if [ "$HB_COMPILER" == "bcc32" ]; then - bcc32 -O2 -d $CFLAGS -I..\include -L..\lib $1.c tools.lib debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib + bcc32 -O2 -d $CFLAGS -I..\include -L..\lib $1.c debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib elif [ "$HB_COMPILER" == "gcc" ]; then - gcc $1.c -o$1.exe $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c -o$1.exe $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon elif [ "$HB_COMPILER" == "mingw32" ]; then - gcc $1.c -o$1.exe $CFLAGS -mno-cygwin -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c -o$1.exe $CFLAGS -mno-cygwin -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon elif [ "$HB_COMPILER" == "rsxnt" ]; then - gcc $1.c -Zwin32 $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c -Zwin32 $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon elif [ "$HB_COMPILER" == "msvc" ]; then - cl -TP -W3 $CFLAGS -I..\include $1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib + cl -TP -W3 $CFLAGS -I..\include $1.c /link /subsystem:CONSOLE ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib echo Ignore LNK4033 warning else echo Error: HB_COMPILER value is unsupported. @@ -117,9 +117,9 @@ else if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtos2; fi if [ "$HB_COMPILER" == "gcc" ]; then - gcc $1.c $CFLAGS -I..\include -L..\lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon elif [ "$HB_COMPILER" == "icc" ]; then - icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp $CFLAGS -I..\include $1.c ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.l + icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp $CFLAGS -I..\include $1.c ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.l else echo Error: HB_COMPILER value is unsupported. fi @@ -129,7 +129,7 @@ else if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtstd; fi if [ "$HB_COMPILER" == "gcc" ]; then - gcc $1.c $CFLAGS -I../include -L../lib -ltools -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon + gcc $1.c $CFLAGS -I../include -L../lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon else echo Error: HB_COMPILER value is unsupported. fi diff --git a/harbour/contrib/libct/ctchrodd.c b/harbour/contrib/libct/ctchrodd.c index b2cb9fcfff..6242387f9f 100644 --- a/harbour/contrib/libct/ctchrodd.c +++ b/harbour/contrib/libct/ctchrodd.c @@ -44,7 +44,7 @@ HB_FUNC( CHARODD ) ULONG i; char * pszResult = ( char * ) hb_xgrab( ulLen / 2 ); - for( i = 0; i <= len; i += 2 ) + for( i = 0; i <= ulLen; i += 2 ) pszResult[ i / 2 ] = pszSource[ i ]; hb_retclen( pszResult, ulLen ); diff --git a/harbour/contrib/libct/make_b32.bat b/harbour/contrib/libct/make_b32.bat new file mode 100644 index 0000000000..14baec63f7 --- /dev/null +++ b/harbour/contrib/libct/make_b32.bat @@ -0,0 +1,29 @@ +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\ct3.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libct/make_vc.bat b/harbour/contrib/libct/make_vc.bat new file mode 100644 index 0000000000..ebf46fb3aa --- /dev/null +++ b/harbour/contrib/libct/make_vc.bat @@ -0,0 +1,29 @@ +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\ct3.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libct/makefile.bc b/harbour/contrib/libct/makefile.bc new file mode 100644 index 0000000000..30ac707edf --- /dev/null +++ b/harbour/contrib/libct/makefile.bc @@ -0,0 +1,162 @@ +# +# $Id$ +# + +# +# Makefile for Harbour Project for Borland C/C++ 3.x, 4.x, 5.x compilers +# + +# +# NOTE: You can use these envvars to configure the make process: +# (note that these are all optional) +# +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the libraries +# HARBOURFLAGS - Extra Harbour compiler options +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# + +# +# NOTE: "echo." intentionally used instead of "echo", to avoid conflicts +# with external commands named echo. +# + +!if $d(B16) + +CC = bcc +AS = tasm + +# Borland C/C++ (DOS 16 bits) +CFLAGS = -mh $(CFLAGS) + +BIN_DIR = bin\b16 +OBJ_DIR = obj\b16 +LIB_DIR = lib\b16 + +!else + +CC = bcc32 +AS = tasm32 + +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) +CFLAGS = -O2 $(CFLAGS) +!endif + +# +# Directory macros. These should never have to change. +# + +INCLUDE_DIR = ..\..\include +TOOLS_DIR = . + +# +# C compiler definition and C flags. These should never have to change. +# + +CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) +CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) +CLIBFLAGSDEBUG = -v $(CLIBFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +LDFLAGS = $(LDFLAGS) + +# +# Macros to access our library names +# + +TOOLS_LIB = $(LIB_DIR)\ct3.lib + +HARBOUR_EXE = $(BIN_DIR)\harbour.exe + +# +# Rules +# + +# +# TOOLS.LIB rules +# + +TOOLS_LIB_OBJS = \ + $(OBJ_DIR)\ctchksum.obj \ + $(OBJ_DIR)\ctchrevn.obj \ + $(OBJ_DIR)\ctchrmix.obj \ + $(OBJ_DIR)\ctchrodd.obj \ + $(OBJ_DIR)\ctcolton.obj \ + $(OBJ_DIR)\ctcrypt.obj \ + $(OBJ_DIR)\ctposupp.obj \ + \ + $(OBJ_DIR)\ctmisc.obj \ + $(OBJ_DIR)\cttoken.obj \ + +# +# Our default target +# + +all: \ + $(TOOLS_LIB) \ + +# +# Library dependencies and build rules +# + +$(TOOLS_LIB) : $(TOOLS_LIB_OBJS) + +# +# TOOLS.LIB dependencies +# + +$(OBJ_DIR)\ctchksum.obj : $(TOOLS_DIR)\ctchksum.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\ctchrevn.obj : $(TOOLS_DIR)\ctchrevn.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\ctchrmix.obj : $(TOOLS_DIR)\ctchrmix.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\ctchrodd.obj : $(TOOLS_DIR)\ctchrodd.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\ctcolton.obj : $(TOOLS_DIR)\ctcolton.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\ctcrypt.obj : $(TOOLS_DIR)\ctcrypt.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\ctposupp.obj : $(TOOLS_DIR)\ctposupp.c + $(CC) $(CLIBFLAGS) -o$@ $** + 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) $(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) $(ARFLAGS) -+$@,, + diff --git a/harbour/contrib/libct/makefile.vc b/harbour/contrib/libct/makefile.vc new file mode 100644 index 0000000000..816ec0fc42 --- /dev/null +++ b/harbour/contrib/libct/makefile.vc @@ -0,0 +1,152 @@ +# +# $Id$ +# + +# +# Makefile for Harbour Project for Microsoft Visual C (32 bits) +# + +# +# NOTE: You can use these envvars to configure the make process: +# (note that these are all optional) +# +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the libraries +# HARBOURFLAGS - Extra Harbour compiler options +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# + +# +# Notes about this makefile: +# +# 1. To add new files to a dependancy list, add an obj name to one of the +# OBJ lists for the appropriate library. +# NOTE: put .prg related obj's last in the lib list. +# +# 2. This is a recursive script. If you change the name of this file, +# be sure to change MK_FILE (a few lines down) to the new name as well. +# +# 3. Recurrsion rules are quite simple: +# If you specifiy /a on the command line, files in the obj\vc dir +# will be deleted, and when nmake recurses, it's without the /a flag +# +# If a .prg.obj rule is fired, nmake will execute this script with +# a specific target as a parameter immediatley after compiling a given +# set of prg files. +# ie: Harbour $< +# nmake /fmakefile.vc obj\vc\rtl.lib2 +# which will simply get make to re-evaluate the dependancy list for the +# lib, and as a result, it will execute the C compiler using the .c.obj +# rule below to create the obj's for the prg's that were created just +# prior to the recurrsive call. Once the obj's are created, the +# recurrsion is complete. +# See additional notes under RTL.LIB below. +# + +MK_FILE = makefile.vc +MK_FLAGS = $(MAKEFLAGS: =) + +OBJ_DIR = ..\..\obj\vc +LIB_DIR = ..\..\lib\vc +BIN_DIR = ..\..\bin\vc + +# +# Directory macros. These should never have to change. +# + +INCLUDE_DIR = ..\..\include +TOOLS_DIR = . + +# +# C compiler definition and C flags. These should never have to change. +# + +AS = masm +CFLAGS = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS) +CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) +CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +LDFLAGS = $(LDFLAGS) + +# +# Macros to access our library names +# + +TOOLS_LIB = $(LIB_DIR)\ct3.lib + +HARBOUR_EXE = $(BIN_DIR)\harbour.exe + +# +# Rules +# + +.SUFFIXES: .prg .lib .c .obj .asm + +# override builtin + +.c.obj:: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +# +# +# + +LIBLIST = \ + $(TOOLS_LIB) \ + +# +# TOOLS.LIB rules +# + +{$(TOOLS_DIR)}.c{$(OBJ_DIR)}.obj:: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +{$(TOOLS_DIR)}.prg{$(OBJ_DIR)}.obj:: + $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(MAKE) -nologo /$(MK_FLAGS) /f$(MK_FILE) $(TOOLS_LIB)2 + +TOOLS_LIB_OBJS = \ + $(OBJ_DIR)\ctchksum.obj \ + $(OBJ_DIR)\ctchrevn.obj \ + $(OBJ_DIR)\ctchrmix.obj \ + $(OBJ_DIR)\ctchrodd.obj \ + $(OBJ_DIR)\ctcolton.obj \ + $(OBJ_DIR)\ctcrypt.obj \ + $(OBJ_DIR)\ctposupp.obj \ + \ + $(OBJ_DIR)\ctmisc.obj \ + $(OBJ_DIR)\cttoken.obj \ + +# +# Our default target +# + + +!if ( "$(MK_FLAGS)"=="A" ) + +all: zot \ + $(TOOLS_LIB) \ + +MK_FLAGS = $(MK_FLAGS:A=) + +zot: + -@if exist $(OBJ_DIR)\*.obj del $(OBJ_DIR)\*.obj > nul + -@if exist $(OBJ_DIR)\*.c del $(OBJ_DIR)\*.c > nul + -@if exist $(OBJ_DIR)\*.h del $(OBJ_DIR)\*.h > nul + -@if exist $(BIN_DIR)\*.exe del $(BIN_DIR)\*.exe > nul + -@if exist $(BIN_DIR)\*.map del $(BIN_DIR)\*.map > nul + +!else + +all: \ + $(TOOLS_LIB) \ + +!endif + +# dummy targets used for prg to c creation + +$(TOOLS_LIB)2 : $(TOOLS_LIB_OBJS) diff --git a/harbour/contrib/libct/readme.txt b/harbour/contrib/libct/readme.txt index 7497bb2e71..1125c6956a 100644 --- a/harbour/contrib/libct/readme.txt +++ b/harbour/contrib/libct/readme.txt @@ -5,8 +5,8 @@ CA-T**ls Compatible Library for Harbour ======================================= -The goal of this library and header file is to provide the -functionality of the original CA-T**ls 3 Library for CA-Cl*pper. +The goal of this library is to provide the functionality +of the original CA-T**ls 3 Library for CA-Cl*pper. Victor Szakats diff --git a/harbour/contrib/libgt/make_b32.bat b/harbour/contrib/libgt/make_b32.bat new file mode 100644 index 0000000000..b72006f1d6 --- /dev/null +++ b/harbour/contrib/libgt/make_b32.bat @@ -0,0 +1,29 @@ +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\gt.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libgt/make_vc.bat b/harbour/contrib/libgt/make_vc.bat new file mode 100644 index 0000000000..ef9f2e8ec8 --- /dev/null +++ b/harbour/contrib/libgt/make_vc.bat @@ -0,0 +1,29 @@ +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\gt.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libgt/makefile.bc b/harbour/contrib/libgt/makefile.bc new file mode 100644 index 0000000000..577f06a133 --- /dev/null +++ b/harbour/contrib/libgt/makefile.bc @@ -0,0 +1,195 @@ +# +# $Id$ +# + +# +# Makefile for Harbour Project for Borland C/C++ 3.x, 4.x, 5.x compilers +# + +# +# NOTE: You can use these envvars to configure the make process: +# (note that these are all optional) +# +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the libraries +# HARBOURFLAGS - Extra Harbour compiler options +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# + +# +# NOTE: "echo." intentionally used instead of "echo", to avoid conflicts +# with external commands named echo. +# + +!if $d(B16) + +CC = bcc +AS = tasm + +# Borland C/C++ (DOS 16 bits) +CFLAGS = -mh $(CFLAGS) + +BIN_DIR = bin\b16 +OBJ_DIR = obj\b16 +LIB_DIR = lib\b16 + +!else + +CC = bcc32 +AS = tasm32 + +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) +CFLAGS = -O2 $(CFLAGS) +!endif + +# +# Directory macros. These should never have to change. +# + +INCLUDE_DIR = ..\..\include +TOOLS_DIR = . + +# +# C compiler definition and C flags. These should never have to change. +# + +CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) +CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) +CLIBFLAGSDEBUG = -v $(CLIBFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +LDFLAGS = $(LDFLAGS) + +# +# Macros to access our library names +# + +TOOLS_LIB = $(LIB_DIR)\tools.lib + +HARBOUR_EXE = $(BIN_DIR)\harbour.exe + +# +# Rules +# + +# +# TOOLS.LIB rules +# + +TOOLS_LIB_OBJS = \ + $(OBJ_DIR)\asciisum.obj \ + $(OBJ_DIR)\ascpos.obj \ + $(OBJ_DIR)\atdiff.obj \ + $(OBJ_DIR)\chareven.obj \ + $(OBJ_DIR)\charmix.obj \ + $(OBJ_DIR)\charodd.obj \ + $(OBJ_DIR)\chrcount.obj \ + $(OBJ_DIR)\chrfirst.obj \ + $(OBJ_DIR)\chrtotal.obj \ + $(OBJ_DIR)\strasint.obj \ + $(OBJ_DIR)\strcount.obj \ + $(OBJ_DIR)\strcspn.obj \ + $(OBJ_DIR)\strdiff.obj \ + $(OBJ_DIR)\strexpan.obj \ + $(OBJ_DIR)\strleft.obj \ + $(OBJ_DIR)\strpbrk.obj \ + $(OBJ_DIR)\strright.obj \ + +# +# Our default target +# + +all: \ + $(TOOLS_LIB) \ + +# +# Library dependencies and build rules +# + +$(TOOLS_LIB) : $(TOOLS_LIB_OBJS) + +# +# TOOLS.LIB dependencies +# + +$(OBJ_DIR)\asciisum.obj : $(TOOLS_DIR)\asciisum.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\ascpos.obj : $(TOOLS_DIR)\ascpos.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\atdiff.obj : $(TOOLS_DIR)\atdiff.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\chareven.obj : $(TOOLS_DIR)\chareven.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\charmix.obj : $(TOOLS_DIR)\charmix.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\charodd.obj : $(TOOLS_DIR)\charodd.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\chrcount.obj : $(TOOLS_DIR)\chrcount.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\chrfirst.obj : $(TOOLS_DIR)\chrfirst.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\chrtotal.obj : $(TOOLS_DIR)\chrtotal.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\strasint.obj : $(TOOLS_DIR)\strasint.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\strcount.obj : $(TOOLS_DIR)\strcount.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\strcspn.obj : $(TOOLS_DIR)\strcspn.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\strdiff.obj : $(TOOLS_DIR)\strdiff.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\strexpan.obj : $(TOOLS_DIR)\strexpan.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\strleft.obj : $(TOOLS_DIR)\strleft.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\strpbrk.obj : $(TOOLS_DIR)\strpbrk.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\strright.obj : $(TOOLS_DIR)\strright.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + diff --git a/harbour/contrib/libgt/makefile.vc b/harbour/contrib/libgt/makefile.vc new file mode 100644 index 0000000000..053fec7c16 --- /dev/null +++ b/harbour/contrib/libgt/makefile.vc @@ -0,0 +1,159 @@ +# +# $Id$ +# + +# +# Makefile for Harbour Project for Microsoft Visual C (32 bits) +# + +# +# NOTE: You can use these envvars to configure the make process: +# (note that these are all optional) +# +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the libraries +# HARBOURFLAGS - Extra Harbour compiler options +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# + +# +# Notes about this makefile: +# +# 1. To add new files to a dependancy list, add an obj name to one of the +# OBJ lists for the appropriate library. +# NOTE: put .prg related obj's last in the lib list. +# +# 2. This is a recursive script. If you change the name of this file, +# be sure to change MK_FILE (a few lines down) to the new name as well. +# +# 3. Recurrsion rules are quite simple: +# If you specifiy /a on the command line, files in the obj\vc dir +# will be deleted, and when nmake recurses, it's without the /a flag +# +# If a .prg.obj rule is fired, nmake will execute this script with +# a specific target as a parameter immediatley after compiling a given +# set of prg files. +# ie: Harbour $< +# nmake /fmakefile.vc obj\vc\rtl.lib2 +# which will simply get make to re-evaluate the dependancy list for the +# lib, and as a result, it will execute the C compiler using the .c.obj +# rule below to create the obj's for the prg's that were created just +# prior to the recurrsive call. Once the obj's are created, the +# recurrsion is complete. +# See additional notes under RTL.LIB below. +# + +MK_FILE = makefile.vc +MK_FLAGS = $(MAKEFLAGS: =) + +OBJ_DIR = ..\..\obj\vc +LIB_DIR = ..\..\lib\vc +BIN_DIR = ..\..\bin\vc + +# +# Directory macros. These should never have to change. +# + +INCLUDE_DIR = ..\..\include +TOOLS_DIR = . + +# +# C compiler definition and C flags. These should never have to change. +# + +AS = masm +CFLAGS = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS) +CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) +CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +LDFLAGS = $(LDFLAGS) + +# +# Macros to access our library names +# + +TOOLS_LIB = $(LIB_DIR)\tools.lib + +HARBOUR_EXE = $(BIN_DIR)\harbour.exe + +# +# Rules +# + +.SUFFIXES: .prg .lib .c .obj .asm + +# override builtin + +.c.obj:: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +# +# +# + +LIBLIST = \ + $(TOOLS_LIB) \ + +# +# TOOLS.LIB rules +# + +{$(TOOLS_DIR)}.c{$(OBJ_DIR)}.obj:: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +{$(TOOLS_DIR)}.prg{$(OBJ_DIR)}.obj:: + $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(MAKE) -nologo /$(MK_FLAGS) /f$(MK_FILE) $(TOOLS_LIB)2 + +TOOLS_LIB_OBJS = \ + $(OBJ_DIR)\asciisum.obj \ + $(OBJ_DIR)\ascpos.obj \ + $(OBJ_DIR)\atdiff.obj \ + $(OBJ_DIR)\chareven.obj \ + $(OBJ_DIR)\charmix.obj \ + $(OBJ_DIR)\charodd.obj \ + $(OBJ_DIR)\chrcount.obj \ + $(OBJ_DIR)\chrfirst.obj \ + $(OBJ_DIR)\chrtotal.obj \ + $(OBJ_DIR)\strasint.obj \ + $(OBJ_DIR)\strcount.obj \ + $(OBJ_DIR)\strcspn.obj \ + $(OBJ_DIR)\strdiff.obj \ + $(OBJ_DIR)\strexpan.obj \ + $(OBJ_DIR)\strleft.obj \ + $(OBJ_DIR)\strpbrk.obj \ + $(OBJ_DIR)\strright.obj \ + +# +# Our default target +# + + +!if ( "$(MK_FLAGS)"=="A" ) + +all: zot \ + $(TOOLS_LIB) \ + +MK_FLAGS = $(MK_FLAGS:A=) + +zot: + -@if exist $(OBJ_DIR)\*.obj del $(OBJ_DIR)\*.obj > nul + -@if exist $(OBJ_DIR)\*.c del $(OBJ_DIR)\*.c > nul + -@if exist $(OBJ_DIR)\*.h del $(OBJ_DIR)\*.h > nul + -@if exist $(BIN_DIR)\*.exe del $(BIN_DIR)\*.exe > nul + -@if exist $(BIN_DIR)\*.map del $(BIN_DIR)\*.map > nul + +!else + +all: \ + $(TOOLS_LIB) \ + +!endif + +# dummy targets used for prg to c creation + +$(TOOLS_LIB)2 : $(TOOLS_LIB_OBJS) diff --git a/harbour/contrib/libmisc/make_b32.bat b/harbour/contrib/libmisc/make_b32.bat new file mode 100644 index 0000000000..4cc501f76d --- /dev/null +++ b/harbour/contrib/libmisc/make_b32.bat @@ -0,0 +1,29 @@ +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\b32\libmisc.lib ..\..\lib\*.* > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libmisc/make_vc.bat b/harbour/contrib/libmisc/make_vc.bat new file mode 100644 index 0000000000..6d6695a64c --- /dev/null +++ b/harbour/contrib/libmisc/make_vc.bat @@ -0,0 +1,29 @@ +@echo off +rem +rem $Id$ +rem + +if "%1" == "clean" goto CLEAN +if "%1" == "CLEAN" goto CLEAN + +:BUILD + + nmake /f makefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + + copy ..\..\lib\vc\libmisc.lib ..\..\lib\*.* >nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + goto EXIT + +:CLEAN + + goto EXIT + +:EXIT + diff --git a/harbour/contrib/libmisc/makefile.bc b/harbour/contrib/libmisc/makefile.bc new file mode 100644 index 0000000000..ecefdd56be --- /dev/null +++ b/harbour/contrib/libmisc/makefile.bc @@ -0,0 +1,181 @@ +# +# $Id$ +# + +# +# Makefile for Harbour Project for Borland C/C++ 3.x, 4.x, 5.x compilers +# + +# +# NOTE: You can use these envvars to configure the make process: +# (note that these are all optional) +# +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the libraries +# HARBOURFLAGS - Extra Harbour compiler options +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# + +# +# NOTE: "echo." intentionally used instead of "echo", to avoid conflicts +# with external commands named echo. +# + +!if $d(B16) + +CC = bcc +AS = tasm + +# Borland C/C++ (DOS 16 bits) +CFLAGS = -mh $(CFLAGS) + +BIN_DIR = bin\b16 +OBJ_DIR = obj\b16 +LIB_DIR = lib\b16 + +!else + +CC = bcc32 +AS = tasm32 + +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) +CFLAGS = -O2 $(CFLAGS) +!endif + +# +# Directory macros. These should never have to change. +# + +INCLUDE_DIR = ..\..\include +TOOLS_DIR = . + +# +# C compiler definition and C flags. These should never have to change. +# + +CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) +CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) +CLIBFLAGSDEBUG = -v $(CLIBFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +LDFLAGS = $(LDFLAGS) + +# +# Macros to access our library names +# + +TOOLS_LIB = $(LIB_DIR)\tools.lib + +HARBOUR_EXE = $(BIN_DIR)\harbour.exe + +# +# Rules +# + +# +# TOOLS.LIB rules +# + +TOOLS_LIB_OBJS = \ + $(OBJ_DIR)\dates2.obj \ + $(OBJ_DIR)\dbftools.obj \ + $(OBJ_DIR)\hb_f.obj \ + $(OBJ_DIR)\mathx.obj \ + $(OBJ_DIR)\strfmt.obj \ + $(OBJ_DIR)\stringsx.obj \ + \ + $(OBJ_DIR)\fileread.obj \ + $(OBJ_DIR)\nconvert.obj \ + $(OBJ_DIR)\numtxten.obj \ + $(OBJ_DIR)\numtxthu.obj \ + $(OBJ_DIR)\stringp.obj + +# +# Our default target +# + +all: \ + $(TOOLS_LIB) \ + +# +# Library dependencies and build rules +# + +$(TOOLS_LIB) : $(TOOLS_LIB_OBJS) + +# +# TOOLS.LIB dependencies +# + +$(OBJ_DIR)\dates2.obj : $(TOOLS_DIR)\dates2.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\dbftools.obj : $(TOOLS_DIR)\dbftools.c + $(CC) $(CLIBFLAGS) -o$@ $** + 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) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\hb_f.obj : $(TOOLS_DIR)\hb_f.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\mathx.obj : $(TOOLS_DIR)\mathx.c + $(CC) $(CLIBFLAGS) -o$@ $** + 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) $(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) $(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) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\strfmt.obj : $(TOOLS_DIR)\strfmt.c + $(CC) $(CLIBFLAGS) -o$@ $** + 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) $(ARFLAGS) -+$@,, + +$(OBJ_DIR)\stringsx.obj : $(TOOLS_DIR)\stringsx.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, + diff --git a/harbour/contrib/libmisc/makefile.vc b/harbour/contrib/libmisc/makefile.vc new file mode 100644 index 0000000000..a9f81d9365 --- /dev/null +++ b/harbour/contrib/libmisc/makefile.vc @@ -0,0 +1,178 @@ +# +# $Id$ +# + +# +# Makefile for Harbour Project for Microsoft Visual C (32 bits) +# + +# +# NOTE: You can use these envvars to configure the make process: +# (note that these are all optional) +# +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the libraries +# HARBOURFLAGS - Extra Harbour compiler options +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# + +# +# Notes about this makefile: +# +# 1. To add new files to a dependancy list, add an obj name to one of the +# OBJ lists for the appropriate library. +# NOTE: put .prg related obj's last in the lib list. +# +# 2. This is a recursive script. If you change the name of this file, +# be sure to change MK_FILE (a few lines down) to the new name as well. +# +# 3. Recurrsion rules are quite simple: +# If you specifiy /a on the command line, files in the obj\vc dir +# will be deleted, and when nmake recurses, it's without the /a flag +# +# If a .prg.obj rule is fired, nmake will execute this script with +# a specific target as a parameter immediatley after compiling a given +# set of prg files. +# ie: Harbour $< +# nmake /fmakefile.vc obj\vc\rtl.lib2 +# which will simply get make to re-evaluate the dependancy list for the +# lib, and as a result, it will execute the C compiler using the .c.obj +# rule below to create the obj's for the prg's that were created just +# prior to the recurrsive call. Once the obj's are created, the +# recurrsion is complete. +# See additional notes under RTL.LIB below. +# + +MK_FILE = makefile.vc +MK_FLAGS = $(MAKEFLAGS: =) + +OBJ_DIR = ..\..\obj\vc +LIB_DIR = ..\..\lib\vc +BIN_DIR = ..\..\bin\vc + +# +# Directory macros. These should never have to change. +# + +INCLUDE_DIR = ..\..\include +TOOLS_DIR = . + +# +# C compiler definition and C flags. These should never have to change. +# + +AS = masm +CFLAGS = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS) +CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) +CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS) +HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) +LDFLAGS = $(LDFLAGS) + +# +# Macros to access our library names +# + +TOOLS_LIB = $(LIB_DIR)\tools.lib + +HARBOUR_EXE = $(BIN_DIR)\harbour.exe + +# +# Rules +# + +.SUFFIXES: .prg .lib .c .obj .asm + +# override builtin + +.c.obj:: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +# +# +# + +LIBLIST = \ + $(TOOLS_LIB) \ + +# +# TOOLS.LIB rules +# + +{$(TOOLS_DIR)}.c{$(OBJ_DIR)}.obj:: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +{$(TOOLS_DIR)}.prg{$(OBJ_DIR)}.obj:: + $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(MAKE) -nologo /$(MK_FLAGS) /f$(MK_FILE) $(TOOLS_LIB)2 + +TOOLS_LIB_OBJS = \ + $(OBJ_DIR)\asciisum.obj \ + $(OBJ_DIR)\ascpos.obj \ + $(OBJ_DIR)\atdiff.obj \ + $(OBJ_DIR)\chareven.obj \ + $(OBJ_DIR)\charmix.obj \ + $(OBJ_DIR)\charodd.obj \ + $(OBJ_DIR)\chrcount.obj \ + $(OBJ_DIR)\chrfirst.obj \ + $(OBJ_DIR)\chrtotal.obj \ + $(OBJ_DIR)\ctchksum.obj \ + $(OBJ_DIR)\ctchrmix.obj \ + $(OBJ_DIR)\ctcolton.obj \ + $(OBJ_DIR)\ctcrypt.obj \ + $(OBJ_DIR)\ctposupp.obj \ + $(OBJ_DIR)\dates2.obj \ + $(OBJ_DIR)\dbftools.obj \ + $(OBJ_DIR)\hb_f.obj \ + $(OBJ_DIR)\mathx.obj \ + $(OBJ_DIR)\strasint.obj \ + $(OBJ_DIR)\strcount.obj \ + $(OBJ_DIR)\strcspn.obj \ + $(OBJ_DIR)\strdiff.obj \ + $(OBJ_DIR)\strexpan.obj \ + $(OBJ_DIR)\strfmt.obj \ + $(OBJ_DIR)\stringsx.obj \ + $(OBJ_DIR)\strleft.obj \ + $(OBJ_DIR)\strpbrk.obj \ + $(OBJ_DIR)\strright.obj \ + \ + $(OBJ_DIR)\ctmisc.obj \ + $(OBJ_DIR)\cttoken.obj \ + $(OBJ_DIR)\fileread.obj \ + $(OBJ_DIR)\nconvert.obj \ + $(OBJ_DIR)\numtxten.obj \ + $(OBJ_DIR)\numtxthu.obj \ + $(OBJ_DIR)\stringp.obj + +# +# Our default target +# + + +!if ( "$(MK_FLAGS)"=="A" ) + +all: zot \ + $(TOOLS_LIB) \ + +MK_FLAGS = $(MK_FLAGS:A=) + +zot: + -@if exist $(OBJ_DIR)\*.obj del $(OBJ_DIR)\*.obj > nul + -@if exist $(OBJ_DIR)\*.c del $(OBJ_DIR)\*.c > nul + -@if exist $(OBJ_DIR)\*.h del $(OBJ_DIR)\*.h > nul + -@if exist $(BIN_DIR)\*.exe del $(BIN_DIR)\*.exe > nul + -@if exist $(BIN_DIR)\*.map del $(BIN_DIR)\*.map > nul + +!else + +all: \ + $(TOOLS_LIB) \ + +!endif + +# dummy targets used for prg to c creation + +$(TOOLS_LIB)2 : $(TOOLS_LIB_OBJS)